Refactor scraper.py to exit properly when exceptions are raised

scraper/src/youtube2zim/scraper.py

@@ -24,7 +24,6 @@
 from libzim.writer import IndexData  # type: ignore
 from pif import get_public_ip
 from zimscraperlib.download import stream_file
-from zimscraperlib.filesystem import delete_callback
 from zimscraperlib.i18n import NotFound, get_language_details
 from zimscraperlib.image.convertion import convert_image
 from zimscraperlib.image.presets import WebpHigh
@@ -66,6 +65,7 @@
 )
 from youtube2zim.utils import (
     clean_text,
+    delete_callback,
     get_slug,
     load_json,
     load_mandatory_json,
@@ -423,17 +423,19 @@
         except KeyboardInterrupt:
             self.zim_file.can_finish = False
             logger.error("KeyboardInterrupt, exiting.")
+            return 1
         except Exception as exc:
             # request Creator not to create a ZIM file on finish
             self.zim_file.can_finish = False
             logger.error(f"Interrupting process due to error: {exc}")
             logger.exception(exc)
-        finally:
+            return 1
+        else:
             logger.info("Finishing ZIM file…")
             self.zim_file.finish()
-
-        logger.info("removing temp folder")
-        shutil.rmtree(self.build_dir, ignore_errors=True)
+        finally:
+            logger.info("removing temp folder")
+            shutil.rmtree(self.build_dir, ignore_errors=True)
 
         logger.info("all done!")
 

scraper/src/youtube2zim/utils.py

@@ -2,6 +2,7 @@
 # vim: ai ts=4 sts=4 et sw=4 nu
 
 import json
+import os
 from pathlib import Path
 
 from slugify import slugify
@@ -44,3 +45,9 @@
 def has_argument(arg_name, all_args):
     """whether --arg_name is specified in all_args"""
     return list(filter(lambda x: x.startswith(f"--{arg_name}"), all_args))
+
+
+def delete_callback(fpath: str | Path):
+    """callback to delete file"""
+    if Path(fpath).exists():
+        os.unlink(fpath)