Merge pull request #199 from DaPigGuy/master

Fix image extraction with `Take a Screenshot`
TenderOwl · May 7, 2024 · 18a7ec0 · 18a7ec0
2 parents d6516f4 + 96396a6
commit 18a7ec0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/frog/services/screenshot_service.py b/frog/services/screenshot_service.py
@@ -28,7 +28,7 @@
 import os
 from gettext import gettext as _
 
-from gi.repository import GObject, Gio, Xdp
+from gi.repository import GObject, Gio, GLib, Xdp
 from loguru import logger
 
 from frog.config import tessdata_config
@@ -101,6 +101,7 @@ def take_screenshot_finish(self, source_object, res: Gio.Task, user_data):
         filename = self.portal.take_screenshot_finish(res)
         # Remove file:// from the path
         filename = filename[7:]
+        filename = GLib.Uri.unescape_string(filename)
         self.decode_image(lang, filename, copy, True)
 
     def decode_image(self,
@@ -142,8 +143,11 @@ def decode_image(self,
 
         finally:
             if remove_source:
-                logger.debug(f"Removing {file}")
-                os.unlink(file)
+                try:
+                    logger.debug(f"Removing {file}")
+                    os.unlink(file)
+                except Exception as e:
+                        logger.debug(f"Error deleting {file}: {e}")
 
         if extracted:
             logger.debug("Extracted successfully")