From dcaa5ce6263644e78c731375b4ea6648b9ab42ac Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Sat, 28 Jan 2023 23:20:32 -0600
Subject: [PATCH] More thumbnailer logic changes

---
 src/shellfm/__init__.py                        |  2 +-
 src/shellfm/windows/__init__.py                |  2 +-
 src/shellfm/windows/tabs/__init__.py           |  2 +-
 src/shellfm/windows/tabs/icons/__init__.py     |  2 +-
 src/shellfm/windows/tabs/icons/icon.py         | 18 ++++++++++++------
 .../windows/tabs/icons/mixins/__init__.py      |  2 +-
 src/shellfm/windows/tabs/utils/__init__.py     |  2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/shellfm/__init__.py b/src/shellfm/__init__.py
index 8a30fad..803a268 100644
--- a/src/shellfm/__init__.py
+++ b/src/shellfm/__init__.py
@@ -1,3 +1,3 @@
 """
-Root of ShellFM
+    Root of ShellFM
 """
diff --git a/src/shellfm/windows/__init__.py b/src/shellfm/windows/__init__.py
index 2463c54..12abfa0 100644
--- a/src/shellfm/windows/__init__.py
+++ b/src/shellfm/windows/__init__.py
@@ -1,3 +1,3 @@
 """
-Window module
+    Window module
 """
diff --git a/src/shellfm/windows/tabs/__init__.py b/src/shellfm/windows/tabs/__init__.py
index c4d8aba..657c1fe 100644
--- a/src/shellfm/windows/tabs/__init__.py
+++ b/src/shellfm/windows/tabs/__init__.py
@@ -1,3 +1,3 @@
 """
-Tabs module
+    Tabs module
 """
diff --git a/src/shellfm/windows/tabs/icons/__init__.py b/src/shellfm/windows/tabs/icons/__init__.py
index 14bb42f..771182f 100644
--- a/src/shellfm/windows/tabs/icons/__init__.py
+++ b/src/shellfm/windows/tabs/icons/__init__.py
@@ -1,3 +1,3 @@
 """
-Icons module
+    Icons module
 """
diff --git a/src/shellfm/windows/tabs/icons/icon.py b/src/shellfm/windows/tabs/icons/icon.py
index b17bd62..62416e1 100644
--- a/src/shellfm/windows/tabs/icons/icon.py
+++ b/src/shellfm/windows/tabs/icons/icon.py
@@ -15,9 +15,9 @@ except Exception as e:
     PImage = None
 
 # Application imports
-from .mixins.desktopiconmixin import DesktopIconMixin
 from .mixins.videoiconmixin import VideoIconMixin
-
+from .mixins.meshsiconmixin import MeshsIconMixin
+from .mixins.desktopiconmixin import DesktopIconMixin
 
 
 
@@ -41,11 +41,17 @@ class Icon(DesktopIconMixin, VideoIconMixin, MeshsIconMixin):
             elif full_path.lower().endswith( ('.desktop',) ):    # .desktop file parsing
                 thumbnl = self.parse_desktop_files(full_path)
 
+            if not thumbnl:
+                thumbnl = self.get_system_thumbnail(full_path, self.sys_icon_wh[0])
+
+            if not thumbnl:
+                thumbnl = self.return_generic_icon()
+
             return thumbnl
         except Exception:
             ...
 
-        return None
+        return self.return_generic_icon()
 
     def create_blender_thumbnail(self, dir, file, full_path=None):
         try:
@@ -117,9 +123,6 @@ class Icon(DesktopIconMixin, VideoIconMixin, MeshsIconMixin):
 
         return None
 
-    def return_generic_icon(self):
-        return GdkPixbuf.Pixbuf.new_from_file(self.DEFAULT_ICON)
-
     def get_system_thumbnail(self, filename, size):
         try:
             gio_file  = Gio.File.new_for_path(filename)
@@ -132,3 +135,6 @@ class Icon(DesktopIconMixin, VideoIconMixin, MeshsIconMixin):
             ...
 
         return None
+
+    def return_generic_icon(self):
+        return GdkPixbuf.Pixbuf.new_from_file(self.DEFAULT_ICON)
diff --git a/src/shellfm/windows/tabs/icons/mixins/__init__.py b/src/shellfm/windows/tabs/icons/mixins/__init__.py
index d5bc819..b6bd8ae 100644
--- a/src/shellfm/windows/tabs/icons/mixins/__init__.py
+++ b/src/shellfm/windows/tabs/icons/mixins/__init__.py
@@ -1,3 +1,3 @@
 """
-Icons mixins module
+    Icons mixins module
 """
diff --git a/src/shellfm/windows/tabs/utils/__init__.py b/src/shellfm/windows/tabs/utils/__init__.py
index aad0ae1..a8e5edd 100644
--- a/src/shellfm/windows/tabs/utils/__init__.py
+++ b/src/shellfm/windows/tabs/utils/__init__.py
@@ -1,3 +1,3 @@
 """
-Utils module
+    Utils module
 """