feat(update): huge changes

utils/icon_resolver.py

@@ -8,31 +8,22 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import GLib, Gtk
 from loguru import logger
 
+import config.data as data
 
-# TODO WIP
-# Idea: nearest string matching algorithm
-#       if already exists: retrieve from json
-#       if found: stor in json: app_id -> icon_name
-#       if not found: store in json -> misisng-icon
-
-
-CACHE_DIR = str(GLib.get_user_cache_dir()) + "/modus"
-ICON_CACHE_FILE = CACHE_DIR + "/icons.json"
-if not os.path.exists(CACHE_DIR):
-    os.makedirs(CACHE_DIR)
+ICON_CACHE_FILE = data.CACHE_DIR + "/icons.json"
+if not os.path.exists(data.CACHE_DIR):
+    os.makedirs(data.CACHE_DIR)
 
 
 class IconResolver:
-    def __init__(
-        self, default_applicaiton_icon: str = "application-x-executable-symbolic"
-    ):
+    def __init__(self, default_applicaiton_icon: str = "application-x-executable-symbolic"):
         if os.path.exists(ICON_CACHE_FILE):
-            f = open(ICON_CACHE_FILE)
-            try:
-                self._icon_dict = json.load(f)
-            except json.JSONDecodeError:
-                logger.info("[ICONS] Cache file does not exist or is corrupted")
-            f.close()
+            with open(ICON_CACHE_FILE) as f:
+                try:
+                    self._icon_dict = json.load(f)
+                except json.JSONDecodeError:
+                    logger.info("[ICONS] Cache file does not exist or is corrupted")
+                    self._icon_dict = {}
         else:
             self._icon_dict = {}
 
@@ -49,20 +40,33 @@ class IconResolver:
         return new_icon
 
     def get_icon_pixbuf(self, app_id: str, size: int = 16):
-        return Gtk.IconTheme.get_default().load_icon(
-            self.get_icon_name(app_id),
-            size,
-            Gtk.IconLookupFlags.FORCE_SIZE,
-        )
+        icon_theme = Gtk.IconTheme.get_default()
+        icon_name = self.get_icon_name(app_id)
+        try:
+            # Try to load the resolved icon.
+            return icon_theme.load_icon(icon_name, size, Gtk.IconLookupFlags.FORCE_SIZE)
+        except GLib.Error as primary_error:
+            logger.warning(
+                f"Warning: Icon '{icon_name}' not found in theme. Error: {primary_error}"
+            )
+            try:
+                # Fallback to the default application icon.
+                return icon_theme.load_icon(
+                    self.default_applicaiton_icon, size, Gtk.IconLookupFlags.FORCE_SIZE
+                )
+            except GLib.Error as fallback_error:
+                logger.error(
+                    f"Error: Fallback icon '{self.default_applicaiton_icon}' also not found. Error: {fallback_error}"
+                )
+                return None
 
     def _store_new_icon(self, app_id: str, icon: str):
         self._icon_dict[app_id] = icon
         with open(ICON_CACHE_FILE, "w") as f:
             json.dump(self._icon_dict, f)
-            f.close()
 
     def _get_icon_from_desktop_file(self, desktop_file_path: str):
-        # TODO: get icon in the [Desktop Entry] section only
+        # Retrieve the icon specified in the [Desktop Entry] section.
         with open(desktop_file_path) as f:
             for line in f.readlines():
                 if "Icon=" in line:
@@ -72,32 +76,27 @@ class IconResolver:
     def _get_desktop_file(self, app_id: str) -> str | None:
         data_dirs = GLib.get_system_data_dirs()
         for data_dir in data_dirs:
-            data_dir = data_dir + "/applications/"
+            data_dir = os.path.join(data_dir, "applications")
             if os.path.exists(data_dir):
-                # Do name resolving here
-
                 files = os.listdir(data_dir)
-                matching = [
-                    s for s in files if "".join(app_id.lower().split()) in s.lower()
-                ]
+                matching = [s for s in files if "".join(app_id.lower().split()) in s.lower()]
                 if matching:
-                    return data_dir + matching[0]
-
+                    return os.path.join(data_dir, matching[0])
                 for word in list(filter(None, re.split(r"-|\.|_|\s", app_id))):
                     matching = [s for s in files if word.lower() in s.lower()]
                     if matching:
-                        return data_dir + matching[0]
-
+                        return os.path.join(data_dir, matching[0])
         return None
 
     def _compositor_find_icon(self, app_id: str):
-        if Gtk.IconTheme.get_default().has_icon(app_id):
+        icon_theme = Gtk.IconTheme.get_default()
+        if icon_theme.has_icon(app_id):
             return app_id
-        if Gtk.IconTheme.get_default().has_icon(app_id + "-desktop"):
+        if icon_theme.has_icon(app_id + "-desktop"):
             return app_id + "-desktop"
         desktop_file = self._get_desktop_file(app_id)
         return (
             self._get_icon_from_desktop_file(desktop_file)
             if desktop_file
             else self.default_applicaiton_icon
-        )
+        )