Fallback to default themes icons for pyui icons if current theme is missing

Author: chrisj951

main-ui/menus/app/app_menu.py

@@ -64,13 +64,16 @@ def append_pyui_apps(self, app_list):
             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=self.get_icon(None,"scraper.png"),
+                            icon=icon,
                             extra_data=boxart_scraper_config,
                             value=BoxArtScraper().scrape_boxart
                         )

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