fix: Make sure pdf_to_image closes the pdf file

Improve error handling for recipe cleanup and improve reporting

Author: MPCodeWriter21

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PDF-Helper"
-version = "0.3.0"
+version = "0.3.1"
 authors = [
   {name = "CodeWriter21(Mehrad Pooryoussof)", email = "CodeWriter21@gmail.com"}
 ]

src/pdf_helper/__init__.py

@@ -11,7 +11,7 @@
 from PIL import Image
 from pypdfium2 import PdfImage, PdfBitmap, PdfDocument
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 __all__ = [
     "bundle",
@@ -186,19 +186,22 @@ def pdf_to_image(
     name = input_file.name.rsplit(".", maxsplit=1)[0]
     # Number of digits each number in the filename should have
     length = len(str(len(pdf)))
-    if not pages_to_convert:
+    try:
+        if not pages_to_convert:
+            for i, page in enumerate(pdf, start=1):
+                log21.info(f"Converting page {i}...", end="\r")
+                image = page.render(scale=scale).to_pil()
+                image.save(output_directory / f"{name}-{i:0>{length}}.png")
+            return len(pdf)
         for i, page in enumerate(pdf, start=1):
+            if i not in pages_to_convert:
+                continue
             log21.info(f"Converting page {i}...", end="\r")
             image = page.render(scale=scale).to_pil()
             image.save(output_directory / f"{name}-{i:0>{length}}.png")
-        return len(pdf)
-    for i, page in enumerate(pdf, start=1):
-        if i not in pages_to_convert:
-            continue
-        log21.info(f"Converting page {i}...", end="\r")
-        image = page.render(scale=scale).to_pil()
-        image.save(output_directory / f"{name}-{i:0>{length}}.png")
-    return len(pages_to_convert)
+        return len(pages_to_convert)
+    finally:
+        pdf.close()
 
 
 def extract_text(

src/pdf_helper/__main__.py

@@ -13,6 +13,7 @@
 
 from . import bundle, split_pdf, extract_text, pdf_to_image, remove_pages, watermark_pdf
 from .utils import parse_pages
+from .recipe import run_recipe
 
 # yapf: ensable
 
@@ -376,12 +377,10 @@ def run_recipe_entry_point(
     if verbose:
         log21.basic_config(level=log21.INFO)
 
-    from .recipe import run_recipe as _run_recipe
-
     if force:
         os.environ['PDF_HELPER_RECIPE_FORCE'] = '1'
 
-    _run_recipe(recipe_path)
+    run_recipe(recipe_path)
 
 
 def main() -> None:

src/pdf_helper/recipe.py

@@ -81,9 +81,13 @@ def ensure_parent(self, path: str) -> None:
 
     def cleanup(self) -> None:
         if self.settings.get("cleanup_temp"):
+            log21.info("Cleaning up temporary files...")
             td = self.settings.get("temp_dir")
             if td and os.path.isdir(td):
-                shutil.rmtree(td, ignore_errors=True)
+                try:
+                    shutil.rmtree(td, ignore_errors=False)
+                except PermissionError as ex:
+                    log21.warning(f"Could not remove temp directory '{td}': {ex}")
 
 
 # Handlers
@@ -322,11 +326,11 @@ def run_recipe(recipe_path: str | Path) -> None:
             log21.info(f"[{step_id}] Done -> {result}")
 
         log21.info(f"Recipe '{name}' completed successfully!")
-    except RecipeError:
-        log21.critical(f"Recipe failed: {sys.exc_info()[1]}")
+    except RecipeError as ex:
+        log21.critical(f"Recipe failed: {ex}")
         sys.exit(1)
-    except Exception:
-        log21.critical(f"Unexpected error in recipe: {sys.exc_info()[1]}")
+    except Exception as ex:
+        log21.critical(f"Unexpected error in recipe: {ex.__class__.__name__}: {ex}")
         sys.exit(1)
     finally:
         ctx.cleanup()