Merge remote-tracking branch 'upstream/main'

Author: github-actions[bot]

LICENSE.md

@@ -1,6 +1,6 @@
 ## License
 
-BSD 3-Clause License (Non-Commercial Use with Commercial Use by Permission)
+Modified BSD 3-Clause License (Non-Commercial Use with Commercial Use by Permission)
 
 Copyright (c) 2025, Christopher Jacobs
 All rights reserved.
@@ -19,13 +19,23 @@ Redistribution and use in source and binary forms, with or without modification,
    - A statement that the Software is used under the terms of this license.
    - If the Software is used in a product, application, or publicly visible project, a credit must be included in any user-facing "Credits", "About", or similar section, clearly identifying the Software and the original author.
 
-5. **Commercial Use**: Commercial use of this software is prohibited without explicit, prior written permission from the copyright holder. This includes, but is not limited to:
+5. **Commercial Use**: Commercial use of this Software is prohibited without explicit, prior written permission from the copyright holder. Commercial use includes, but is not limited to:
+
    - Using the Software or derivative works in products or services for which payment, subscription, or compensation is requested.
    - Offering the Software or services derived from it in exchange for **donations**, **pay-what-you-want models**, or **any other form of voluntary or suggested payment**, if payment is mandatory for access.
+   - Permission must be obtained prior to any commercial distribution or use.
+
+   Requests for commercial use must include a brief description of the intended use and a means of contact, and must be submitted to:
+
+   - **Email:** [email protected]  
+   - **Discord:** @chrisbastion
+
+6. **Non-Commercial Redistribution Notification**:  
+Redistribution of this Software or derivative works for **non-commercial purposes** requires notification to the copyright holder.
 
-6. **Notification Requirement**: Use of this Software under the non-commercial terms, including redistribution or creation of derivative works, requires notification to the original author. This notification must include a brief description of the intended use and a means of contact, and must be sent to:
+Such notification must include a brief description of the intended use and a means of contact, and must be sent to:
 
-   - Email: **[email protected]**  
-   - Discord: **@chrisbastion**
+- **Email:** [email protected]  
+- **Discord:** @chrisbastion
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

main-ui/devices/abstract_device.py

@@ -425,4 +425,6 @@ def startup_init(self, include_wifi):
     def might_require_surface_format_conversion(self):
         pass
 
-    
+    @abstractmethod
+    def perform_sdcard_ro_check(self):
+        pass

main-ui/devices/device.py

@@ -469,3 +469,6 @@ def startup_init(include_wifi):
     def might_require_surface_format_conversion():
         return Device._impl.might_require_surface_format_conversion()
 
+    @staticmethod
+    def perform_sdcard_ro_check():
+        return Device._impl.perform_sdcard_ro_check()

main-ui/devices/device_common.py

@@ -4,6 +4,7 @@
 import socket
 import subprocess
 import sys
+import tempfile
 import time
 from audio.audio_player_none import AudioPlayerNone
 from controller.controller_inputs import ControllerInput
@@ -469,3 +470,16 @@ def _load_system_config(self, config_path, config_if_missing):
             os.remove(config_path)
             ConfigCopier.ensure_config(config_path, config_if_missing)
             self.system_config = SystemConfig(config_path)
+
+
+    def is_filesystem_read_only(self,path="/mnt/SDCARD"):
+        try:
+            with tempfile.NamedTemporaryFile(dir=path, delete=True):
+                pass
+            return False
+        except OSError:
+            return True
+
+    def perform_sdcard_ro_check(self):
+        if self.is_filesystem_read_only("/mnt/SDCARD"):
+            Display.display_message("Warning: /mnt/SDCARD is read-only. Please check your SD card.", duration_ms=10000)

main-ui/devices/muos/muos_device.py

@@ -379,3 +379,6 @@ def supports_qoi(self):
 
     def keep_running_on_error(self):
         return False
+
+    def perform_sdcard_ro_check(self):
+        PyUiLogger.get_logger().info("MUOS Device does not check for read-only SD card status.")

main-ui/mainui.py

@@ -233,6 +233,8 @@ def main():
         Controller.init()
         Language.init()
 
+        Device.perform_sdcard_ro_check()
+
         check_for_msg_display(args)
         check_for_msg_display_realtime(args)
         check_for_msg_display_socket_based(args)

main-ui/utils/logger.py

@@ -28,59 +28,91 @@ def init(cls, log_dir, logger_name):
         if cls._logger is not None:
             return cls._logger
 
-        cls.rotate_logs(log_dir)  # Ensure logs are rotated before initializing logger
-
-        logger = logging.getLogger(logger_name)
-        logger.setLevel(logging.DEBUG)
-
-        if not logger.handlers:
-            formatter = logging.Formatter(
-                "%(asctime)s - %(filename)s:%(lineno)d - %(funcName)s - %(levelname)s - %(message)s"
-            )
-
-            # Console handler
-            console_handler = logging.StreamHandler()
-            console_handler.setLevel(logging.DEBUG)
-            console_handler.setFormatter(formatter)
-            console_handler = logging.StreamHandler(sys.__stdout__)
-
-            # File handler
-            file_handler = RotatingFileHandler(os.path.join(log_dir,"pyui.log"),
-                maxBytes=1024 * 1024,  # 1MB file size limit
-                backupCount=5               # Keep up to 5 backup files)
-            )
-            file_handler.setLevel(logging.DEBUG)
-            file_handler.setFormatter(formatter)
-
-            logger.addHandler(console_handler)
-            logger.addHandler(file_handler)
-            
-        # Redirect stdout and stderr to logger
-        sys.stdout = StreamToLogger(logger, logging.INFO, sys.__stdout__)
-        sys.stderr = StreamToLogger(logger, logging.ERROR, sys.__stderr__)
-
-        cls._logger = logger
-        return cls._logger
+        try:
+            cls.rotate_logs(log_dir)  # Ensure logs are rotated before initializing logger
+
+            logger = logging.getLogger(logger_name)
+            logger.setLevel(logging.DEBUG)
+
+            if not logger.handlers:
+                formatter = logging.Formatter(
+                    "%(asctime)s - %(filename)s:%(lineno)d - %(funcName)s - %(levelname)s - %(message)s"
+                )
+
+                # Console handler (explicit stdout)
+                console_handler = logging.StreamHandler(sys.__stdout__)
+                console_handler.setLevel(logging.DEBUG)
+                console_handler.setFormatter(formatter)
+
+                # File handler
+                file_handler = RotatingFileHandler(
+                    os.path.join(log_dir, "pyui.log"),
+                    maxBytes=1024 * 1024,
+                    backupCount=5
+                )
+                file_handler.setLevel(logging.DEBUG)
+                file_handler.setFormatter(formatter)
+
+                logger.addHandler(console_handler)
+                logger.addHandler(file_handler)
+
+            # Redirect stdout/stderr
+            sys.stdout = StreamToLogger(logger, logging.INFO, sys.__stdout__)
+            sys.stderr = StreamToLogger(logger, logging.ERROR, sys.__stderr__)
+
+            cls._logger = logger
+            return logger
+
+        except Exception as e:
+            # --- Fallback logger ---
+            fallback = logging.getLogger(f"{logger_name}_fallback")
+            fallback.setLevel(logging.DEBUG)
+
+            if not fallback.handlers:
+                formatter = logging.Formatter(
+                    "%(asctime)s - %(levelname)s - %(message)s"
+                )
+
+                out_handler = logging.StreamHandler(sys.__stdout__)
+                err_handler = logging.StreamHandler(sys.__stderr__)
+
+                out_handler.setLevel(logging.INFO)
+                err_handler.setLevel(logging.ERROR)
+
+                out_handler.setFormatter(formatter)
+                err_handler.setFormatter(formatter)
+
+                fallback.addHandler(out_handler)
+                fallback.addHandler(err_handler)
+
+            fallback.error("Logger initialization failed, using fallback logger", exc_info=True)
+
+            cls._logger = fallback
+            return fallback
+
 
     @staticmethod
     def rotate_logs(log_dir):
-        # Perform log rotation before initializing the logger
-        log_path = os.path.join(log_dir,"pyui.log")
-        backup_path = os.path.join(log_dir,"pyui.log.5")
-
-        # Rotate logs manually before starting
-        if os.path.exists(backup_path):
-            os.remove(backup_path)
-        for i in range(4, 0, -1):
-            src = f"{log_path}.{i}" if i > 1 else log_path
-            dest = f"{log_path}.{i + 1}"
-            if os.path.exists(src):
-                os.rename(src, dest)
-
-        # Optionally, delete the pyui-5.log if it exists
-        if os.path.exists(f"{log_path}.5"):
-            os.remove(f"{log_path}.5")
-            
+        try:
+            # Perform log rotation before initializing the logger
+            log_path = os.path.join(log_dir,"pyui.log")
+            backup_path = os.path.join(log_dir,"pyui.log.5")
+
+            # Rotate logs manually before starting
+            if os.path.exists(backup_path):
+                os.remove(backup_path)
+            for i in range(4, 0, -1):
+                src = f"{log_path}.{i}" if i > 1 else log_path
+                dest = f"{log_path}.{i + 1}"
+                if os.path.exists(src):
+                    os.rename(src, dest)
+
+            # Optionally, delete the pyui-5.log if it exists
+            if os.path.exists(f"{log_path}.5"):
+                os.remove(f"{log_path}.5")
+        except Exception as e:
+            print(f"Error rotating logs (likely means RO file system): {e}")
+
     @classmethod
     def get_logger(cls):
         return cls._logger