v2.2.2 - Rotated PDF Pages & Tag Editor Field Clearing

NEWS.md

@@ -6,6 +6,23 @@ width: 128px;
 border-radius: 128px;
 " />
 
+## v2.2.2
+
+- Fixes
+    - Clearing a field in the tag editor now removes it from the comic's tags.
+      Cleared fields were silently left unchanged in the archive (comicbox
+      4.5.0).
+    - The tag editor's Monochrome checkbox reads and writes again, and clearing
+      it removes the tag instead of marking the comic color (comicbox 4.5.1).
+    - PDF pages scanned upside down or sideways and righted by the pdf's
+      rotation attribute displayed rotated when the reader served them as images
+      (comicbox-pdffile 0.6.3).
+    - Reading a PDF that needs in-memory repair no longer rewrites the file on
+      disk (comicbox-pdffile 0.6.3).
+    - PDFs no longer count an embedded metadata file as a page (comicbox 4.5.0).
+      Imported PDFs correct themselves on their next re-import, or use Force
+      Update Tags.
+
 ## v2.2.1
 
 - Features

codex/librarian/bookmark/latest_version.py

@@ -24,7 +24,7 @@ class CodexLatestVersionUpdater(WorkerStatusBase):
     @staticmethod
     def _fetch_latest_version():
         """Fetch Latest Remotely."""
-        response = urlopen(_REPO_URL, timeout=_REPO_TIMEOUT)  # noqa: S310
+        response = urlopen(_REPO_URL, timeout=_REPO_TIMEOUT)
         source = response.read()
         decoded_source = source.decode("utf-8")
         return json.loads(decoded_source)["info"]["version"]

codex/librarian/scribe/search/prepare.py

@@ -121,8 +121,7 @@ def prepare_import_fts_entry(
         """Prepare ComicFTS object from import data."""
         cls._create_comicfts_entry_m2ms(entry, existing_m2m_values)
         cls._create_comicfts_entry_fks(entry)
-        for field_name in entry:
-            value = entry[field_name]
+        for field_name, value in entry.items():
             if isinstance(value, tuple):
                 entry[field_name] = ",".join(sorted(value))
 

codex/librarian/scribe/tag_writer.py

@@ -72,20 +72,22 @@ def _build_items(
         """Build BulkWriteItem list from task data."""
         formats = frozenset(task.formats) if task.formats else None
         mode = cast("Mode", task.mode)
+        delete_keys = frozenset(task.delete_keys) if task.delete_keys else None
         items = []
         for pk, path in comic_paths.items():
             if task.per_comic_patches and pk in task.per_comic_patches:
                 patch = task.per_comic_patches[pk]
-            elif task.patch:
-                patch = task.patch
             else:
+                patch = task.patch or {}
+            if not patch and not delete_keys:
                 continue
             items.append(
                 BulkWriteItem(
                     path=path,
                     patch=patch,
                     mode=mode,
                     formats=formats,
+                    delete_keys=delete_keys,
                 )
             )
         return items
@@ -113,7 +115,15 @@ def _reimport_unwatched(self, comic_paths: dict[int, Path]) -> None:
 
     @staticmethod
     def _build_base_config(task: BulkTagWriteTask):
-        """Return a config with delete_orig set, or None when not deleting."""
+        """
+        Return a config with delete_orig set, or None when not deleting.
+
+        Never pass codex's read-side ``COMICBOX_CONFIG`` here. Comicbox
+        unions a write's ``delete_keys`` with the base config's, and that
+        config carries the big parse-skip set of schema fields codex
+        doesn't consume (pages, reprints, cover_image, ...). Using it as a
+        write base would strip every one of those from the user's archive.
+        """
         if not task.delete_original:
             return None
         cfg = get_config()

codex/librarian/scribe/tasks.py

@@ -43,6 +43,10 @@ class BulkTagWriteTask(ScribeTask):
     delete_original: bool = False
     patch: dict[str, Any] | None = None
     per_comic_patches: dict[int, dict[str, Any]] = field(default_factory=dict)
+    # Comicbox glom key paths to clear from each archive's metadata. Merging
+    # can only add or replace (empty patch values are pruned on schema load),
+    # so cleared tag-editor fields travel here, not in the patch.
+    delete_keys: tuple[str, ...] = ()
     # When True, rename each written archive to the comicbox (comicfn2dict)
     # filename scheme after its tags are written. With no patch (rename-only),
     # every resolved comic is renamed from its existing on-archive metadata.

codex/mail.py

@@ -20,7 +20,7 @@
 class DBEmailBackend(EmailBackend):
     """SMTP backend that sources connection params from the DB on init."""
 
-    def __init__(  # noqa: PLR0913 - signature mirrors SMTPBackend.__init__
+    def __init__(  # noqa: PLR0913, PLR0917 - signature mirrors SMTPBackend.__init__
         self,
         host=None,
         port=None,

codex/serializers/admin/tagging.py

@@ -43,6 +43,9 @@ class TagWriteRequestSerializer(Serializer):
     collection = CharField()
     pks = ListField(child=CharField())
     patch = CharField(required=False, default="")
+    # Comicbox key paths to clear; separate from the patch because a merge
+    # write can only add or replace values, never remove them.
+    delete_keys = ListField(child=CharField(), required=False, default=list)
     mode = CharField(required=False, default="update")
     formats = ListField(child=CharField(), required=False, default=["COMIC_INFO"])
     delete_original = BooleanField(required=False, default=None)

codex/views/admin/tagwrite.py

@@ -2,6 +2,7 @@
 
 import json
 from collections.abc import Sequence
+from dataclasses import replace
 from pathlib import Path
 from types import MappingProxyType
 from typing import override
@@ -240,7 +241,7 @@ class AdminTagWritePreflightView(FilteredComicPksView):
     """Check how many comics need conversion before writing."""
 
     @staticmethod
-    def _preview_one(old_path: Path, metadata: dict | None) -> str:
+    def _preview_one(old_path: Path, metadata: dict | None, config) -> str:
         """
         Return the comicbox-scheme name the given patch produces for one comic.
 
@@ -250,17 +251,31 @@ def _preview_one(old_path: Path, metadata: dict | None) -> str:
         the archive (I/O). Returns "" when no name could be built.
         """
         try:
-            with Comicbox(old_path, config=COMICBOX_CONFIG, metadata=metadata) as car:
+            with Comicbox(old_path, config=config, metadata=metadata) as car:
                 return car.to_string(MetadataFormats.FILENAME) or ""
         except Exception:
             return ""
 
     def _filename_previews(
-        self, comic_pks: frozenset[int], patch_str: str
+        self,
+        comic_pks: frozenset[int],
+        patch_str: str,
+        delete_keys: tuple[str, ...] = (),
     ) -> list[dict[str, str]]:
         """Preview the rename (old → new) for each selected comic, capped."""
         patch = json.loads(patch_str or "null")
         metadata = {"comicbox": patch} if patch else None
+        # Pending cleared fields must vanish from the previewed name exactly
+        # as the real write (BulkWriteItem.delete_keys) will clear them.
+        config = COMICBOX_CONFIG
+        if delete_keys:
+            config = replace(
+                config,
+                general=replace(
+                    config.general,
+                    delete_keys=config.general.delete_keys | frozenset(delete_keys),
+                ),
+            )
         comics = (
             Comic.objects.filter(pk__in=comic_pks)
             .only("pk", "path")
@@ -270,7 +285,10 @@ def _filename_previews(
         for comic in comics:
             old_path = Path(comic.path)
             previews.append(
-                {"old": old_path.name, "new": self._preview_one(old_path, metadata)}
+                {
+                    "old": old_path.name,
+                    "new": self._preview_one(old_path, metadata, config),
+                }
             )
         return previews
 
@@ -306,7 +324,9 @@ def post(self, request):
                 "delete_original": delete_original,
                 "rename": rename,
                 "filename_previews": self._filename_previews(
-                    comic_pks, data.get("patch") or ""
+                    comic_pks,
+                    data.get("patch") or "",
+                    tuple(data.get("delete_keys") or ()),
                 ),
                 "skipped": self.skipped_read_only,
             }
@@ -346,6 +366,7 @@ def post(self, request):
         task = BulkTagWriteTask(
             comic_pks=comic_pks,
             patch=json.loads(data.get("patch") or "null"),
+            delete_keys=tuple(data.get("delete_keys") or ()),
             mode=data["mode"],
             formats=tuple(data["formats"]),
             delete_original=delete_original,

codex/views/browser/breadcrumbs.py

@@ -67,7 +67,7 @@ def __init__(self, *args, **kwargs) -> None:
         """Set params for the type checker."""
         super().__init__(*args, **kwargs)
         # Use 0 to indicate unmemoized because None is a valid value
-        self._collection_instance: BrowserCollectionModel | None | int = 0
+        self._collection_instance: BrowserCollectionModel | int | None = 0
 
     def _get_collection_query(self, model):
         """Get the collection query for the collection instance."""

codex/views/error.py

@@ -9,7 +9,7 @@
 
 def codex_exception_handler(
     exc, context
-) -> JsonResponse | None | HttpResponseRedirect | Response:
+) -> JsonResponse | HttpResponseRedirect | Response | None:
     """Assume OPDS clients want redirects instead of errors."""
     response = None
     request = context.get("request")

codex/views/opds/error.py

@@ -42,7 +42,7 @@ def _get_redirect_to_start_response(request: HttpRequest) -> HttpResponseRedirec
 
 def codex_opds_exception_handler(
     exc, context
-) -> JsonResponse | None | HttpResponseRedirect | Response:
+) -> JsonResponse | HttpResponseRedirect | Response | None:
     """
     Assume OPDS clients want redirects instead of errors.