Merge remote-tracking branch 'upstream/main'

Author: github-actions[bot]

main-ui/devices/miyoo/mini/miyoo_mini_common.py

@@ -278,6 +278,9 @@ def get_ip_addr_text(self):
         else:
             return "Unsupported"
 
+    def supports_wifi(self):
+        return self.miyoo_mini_specific_model_variables.supports_wifi
+
     def get_charge_status(self):
         return self.miyoo_mini_specific_model_variables.get_charge_status()
 

main-ui/menus/app/app_menu.py

@@ -59,19 +59,25 @@ def handle_app_selection(self, app):
         Display.reinitialize()
 
     def append_pyui_apps(self, app_list):
-        boxart_scraper_config = PyUiAppConfig("Boxart Scraper")
-        
-        app_list.append(
-                GridOrListEntry(
-                    primary_text=boxart_scraper_config.get_label() + "(Hidden)" if AppsManager.is_hidden(boxart_scraper_config) else boxart_scraper_config.get_label(),
-                    image_path=None,
-                    image_path_selected=None,
-                    description="Scrape game boxart",
-                    icon=self.get_icon(None,"scraper.png"),
-                    extra_data=boxart_scraper_config,
-                    value=BoxArtScraper().scrape_boxart
+        system_config = Device.get_system_config()
+        if(not system_config.simple_mode_enabled()):
+            boxart_scraper_config = PyUiAppConfig("Boxart Scraper")
+            hidden = AppsManager.is_hidden(boxart_scraper_config) and not self.show_all_apps
+            if(not hidden):
+                icon = self.get_icon(None,"scraper.png")
+                if(icon is None):
+                    icon = Theme.get_cfw_default_icon("scraper.png")
+                app_list.append(
+                        GridOrListEntry(
+                            primary_text=boxart_scraper_config.get_label() + "(Hidden)" if AppsManager.is_hidden(boxart_scraper_config) else boxart_scraper_config.get_label(),
+                            image_path=None,
+                            image_path_selected=None,
+                            description="Scrape game boxart",
+                            icon=icon,
+                            extra_data=boxart_scraper_config,
+                            value=BoxArtScraper().scrape_boxart
+                        )
                 )
-        )
 
     def run_app_selection(self) :
         running = True

main-ui/menus/games/game_system_select_menu.py

@@ -238,8 +238,8 @@ def add_extras_to_systems_list(self, systems_list):
                 systems_list.append(GridOrListEntry(
                         primary_text="Apps",
                         primary_text_long="Applications",
-                        image_path=self.get_main_menu_icon("apps",Theme.settings()),
-                        image_path_selected=self.get_main_menu_icon_selected("apps",Theme.settings_selected()),
+                        image_path=self.get_main_menu_icon("apps",Theme.app()),
+                        image_path_selected=self.get_main_menu_icon_selected("apps",Theme.app_selected()),
                         description = "Launch Applications",
                         icon=None,
                         value=lambda input_value: self.run_extra(input_value, "Apps",self.app_menu.run_app_selection)

main-ui/themes/theme.py

@@ -49,8 +49,8 @@ def set_theme_path(cls,path, width = 0, height = 0):
         cls._load_from_file(os.path.join(path, config_path))
 
         cls._path = path
-        cls._skin_folder = cls._get_asset_folder("skin", width, height)
-        cls._icon_folder = cls._get_asset_folder("icons", width, height)
+        cls._skin_folder = cls._get_asset_folder(cls._path, "skin", width, height)
+        cls._icon_folder = cls._get_asset_folder(cls._path, "icons", width, height)
         daijisho_theme_index_file = os.path.join(cls._path, cls._icon_folder,"index.json")
         if os.path.exists(daijisho_theme_index_file):
             try:
@@ -132,17 +132,17 @@ def load_defaults_so_user_can_see_at_least(cls, path):
         cls._load_from_file(os.path.join(path, "config.json"))
 
         cls._path = path
-        cls._skin_folder = cls._get_asset_folder("skin", -1, -1)
-        cls._icon_folder = cls._get_asset_folder("icons", -1, -1)
+        cls._skin_folder = cls._get_asset_folder(cls._path,"skin", -1, -1)
+        cls._icon_folder = cls._get_asset_folder(cls._path,"icons", -1, -1)
 
     @classmethod
     def get_theme_path(cls):
         return cls._path
 
     @classmethod
-    def _get_asset_folder(cls, base_folder, width, height):
+    def _get_asset_folder(cls, path, base_folder, width, height):
         folder = f"{base_folder}_{width}x{height}"
-        full_path = os.path.join(cls._path, folder)
+        full_path = os.path.join(path, folder)
         if os.path.isdir(full_path):
             #PyUiLogger.get_logger().info(f"Resolution specific assets found, using {folder}")
             return folder
@@ -1508,3 +1508,31 @@ def check_and_create_ra_assets(cls):
                                     1.00)
 
 
+
+    @classmethod
+    def get_cfw_default_icon(cls, icon_name):
+        cfw_theme = PyUiConfig.get("theme")
+        PyUiLogger.get_logger().debug(f"Getting CFW default icon '{icon_name}' for theme '{cfw_theme}'")
+        if(cfw_theme is None):
+            PyUiLogger.get_logger().debug(f"CFW theme is None, cannot get icon")
+            return None
+        else:
+            cfw_theme_path = os.path.join(PyUiConfig.get("themeDir"),cfw_theme)
+            PyUiLogger.get_logger().debug(f"cfw_theme_path is '{cfw_theme_path}'")
+            path = os.path.join(cfw_theme_path, 
+                                cls._get_asset_folder(cfw_theme_path, "icons", 
+                                                      Device.screen_width(), 
+                                                      Device.screen_height()), 
+                                "app",icon_name)
+
+            PyUiLogger.get_logger().debug(f"icon path resolved to '{path}'")
+            if os.path.exists(path):
+                return path
+
+            # Fallback only makes sense for .qoi assets/icons
+            if path.endswith(".qoi"):
+                png_path = path[:-4] + ".png"
+                if os.path.exists(png_path):
+                    return png_path
+
+            return None

main-ui/utils/config_copier.py

@@ -14,18 +14,21 @@ def ensure_config(cls, file_path, default_config_file):
         Ensures that a config file exists at the given file_path.
         If it does not, copies 'config.json' from the script's directory to that location.
         """
-        dest = Path(file_path)
-        if dest.exists() and dest.stat().st_size > 0:
-            return  # Nothing to do
-
-        if not default_config_file.exists():
-            PyUiLogger.get_logger().error(f"{default_config_file} does not exist")
-            raise FileNotFoundError(f"Source config file not found: {default_config_file}")
-
-        # Create parent directories if necessary
-        dest.parent.mkdir(parents=True, exist_ok=True)
-
-        PyUiLogger.get_logger().info(f"Copying {default_config_file} to {file_path}")
-        # Copy the file
-        shutil.copy2(default_config_file, dest)
-        
+        try:
+            dest = Path(file_path)
+            if dest.exists() and dest.stat().st_size > 0:
+                return  # Nothing to do
+
+            if not default_config_file.exists():
+                PyUiLogger.get_logger().error(f"{default_config_file} does not exist")
+                raise FileNotFoundError(f"Source config file not found: {default_config_file}")
+
+            # Create parent directories if necessary
+            dest.parent.mkdir(parents=True, exist_ok=True)
+
+            PyUiLogger.get_logger().info(f"Copying {default_config_file} to {file_path}")
+            # Copy the file
+            shutil.copy2(default_config_file, dest)
+        except Exception as e:
+            # Log the exception with stack trace
+            PyUiLogger.get_logger().exception(f"Failed to ensure config for {file_path}: {e}")