v1.12.4

NEWS.md

@@ -6,6 +6,13 @@ width: 128px;
 border-radius: 128px;
 " />
 
+## v1.12.4
+
+- Fixes
+    - Crash on Cleanup Favorites Janitor Job.
+- Features
+    - Force Update Tags by individual group.
+
 ## v1.12.3
 
 - Fixes

codex/librarian/scribe/force_updater.py

@@ -0,0 +1,38 @@
+"""Force a metadata re-import for an explicit set of comic pks."""
+
+from collections import defaultdict
+
+from codex.librarian.scribe.importer.tasks import ImportTask
+from codex.librarian.scribe.tasks import ForceUpdateComicsTask
+from codex.librarian.worker import WorkerBase
+from codex.models.comic import Comic
+
+
+class ForceUpdater(WorkerBase):
+    """Dispatch ImportTasks scoped to a caller-supplied set of comic pks."""
+
+    def force_update(self, task: ForceUpdateComicsTask) -> None:
+        """Group comic pks by library and dispatch a forced ImportTask per library."""
+        if not task.comic_pks:
+            self.log.debug("Force update called with no comic pks.")
+            return
+
+        comics = Comic.objects.filter(pk__in=task.comic_pks).only("path", "library_id")
+        library_path_map: defaultdict[int, set[str]] = defaultdict(set)
+        for comic in comics:
+            library_path_map[comic.library_id].add(comic.path)  # pyright: ignore[reportAttributeAccessIssue]
+
+        total = 0
+        for library_id, paths in library_path_map.items():
+            files_modified = frozenset(paths)
+            if not files_modified:
+                continue
+            import_task = ImportTask(
+                library_id=library_id,
+                files_modified=files_modified,
+                force_import_metadata=True,
+                check_metadata_mtime=False,
+            )
+            self.librarian_queue.put(import_task)
+            total += len(files_modified)
+        self.log.info(f"Force update queued for {total} comics.")

codex/librarian/scribe/priority.py

@@ -11,6 +11,7 @@
     JanitorCleanCoversTask,
     JanitorCleanFKsTask,
     JanitorCleanupBookmarksTask,
+    JanitorCleanupFavoritesTask,
     JanitorCleanupSessionsTask,
     JanitorCleanupSettingsTask,
     JanitorCodexUpdateTask,
@@ -29,6 +30,7 @@
     SearchIndexSyncTask,
 )
 from codex.librarian.scribe.tasks import (
+    ForceUpdateComicsTask,
     ImportAbortTask,
     LazyImportComicsTask,
     ScribeTask,
@@ -47,14 +49,16 @@
     JanitorFTSIntegrityCheckTask,
     JanitorFTSRebuildTask,
     JanitorImportForceAllFailedTask,
+    ForceUpdateComicsTask,
     ImportTask,
     LazyImportComicsTask,
     UpdateGroupsTask,
     JanitorCleanFKsTask,
     JanitorCleanCoversTask,
     JanitorCleanupSessionsTask,
-    JanitorCleanupSettingsTask,
     JanitorCleanupBookmarksTask,
+    JanitorCleanupSettingsTask,
+    JanitorCleanupFavoritesTask,
     SearchIndexClearTask,
     SearchIndexCleanStaleTask,
     SearchIndexSyncTask,

codex/librarian/scribe/scribed.py

@@ -4,6 +4,7 @@
 from queue import PriorityQueue
 from typing import Final, override
 
+from codex.librarian.scribe.force_updater import ForceUpdater
 from codex.librarian.scribe.importer.importer import ComicImporter
 from codex.librarian.scribe.importer.tasks import ImportTask
 from codex.librarian.scribe.janitor.adopt_folders import OrphanFolderAdopter
@@ -22,6 +23,7 @@
 )
 from codex.librarian.scribe.tasks import (
     CleanupAbortTask,
+    ForceUpdateComicsTask,
     ImportAbortTask,
     LazyImportComicsTask,
     SearchIndexSyncAbortTask,
@@ -74,6 +76,11 @@ def process_item(self, item) -> None:
                     self.log, self.librarian_queue, self.db_write_lock
                 )
                 worker.lazy_import(task)
+            case ForceUpdateComicsTask():
+                worker = ForceUpdater(
+                    self.log, self.librarian_queue, self.db_write_lock
+                )
+                worker.force_update(task)
             case UpdateGroupsTask():
                 worker = TimestampUpdater(
                     self.log, self.librarian_queue, self.db_write_lock

codex/librarian/scribe/tasks.py

@@ -25,6 +25,13 @@ class LazyImportComicsTask(ScribeTask):
     pks: frozenset[int]
 
 
+@dataclass
+class ForceUpdateComicsTask(ScribeTask):
+    """Force a metadata re-import for a specific set of comic pks."""
+
+    comic_pks: frozenset[int]
+
+
 class ImportAbortTask(ScribeTask):
     """Abort Import."""
 

codex/urls/api/browser.py

@@ -8,6 +8,7 @@
 from codex.views.browser.browser import BrowserView
 from codex.views.browser.choices import BrowserChoicesAvailableView, BrowserChoicesView
 from codex.views.browser.download import GroupDownloadView
+from codex.views.browser.force_update import ForceUpdateView
 from codex.views.browser.metadata import MetadataView
 from codex.views.browser.saved_settings import (
     SavedBrowserSettingsListView,
@@ -81,4 +82,12 @@
         LazyImportView.as_view(),
         name="import",
     ),
+    #
+    #
+    # Force Update Tags
+    path(
+        "<int_list:pks>/force_update",
+        ForceUpdateView.as_view(),
+        name="force_update",
+    ),
 ]

codex/views/browser/filters/filter.py

@@ -35,7 +35,7 @@
 # ``comic__folders`` (download) rather than ``parent_folder`` (FK).
 # Mirrors the branches in :meth:`GroupFilterView._get_rel_for_pks`.
 _M2M_FOLDER_GROUP_TARGETS: Final[frozenset[str]] = frozenset(
-    {"cover", "choices", "bookmark", "download"}
+    {"cover", "choices", "bookmark", "download", "force_update"}
 )
 
 # Group codes whose transitive-favorite clauses introduce m2m JOINs on

codex/views/browser/filters/group.py

@@ -11,7 +11,7 @@
     GROUP_RELATION,
 )
 
-_GROUP_REL_TARGETS: Final = frozenset({"cover", "choices", "bookmark"})
+_GROUP_REL_TARGETS: Final = frozenset({"cover", "choices", "bookmark", "force_update"})
 _PK_REL_TARGETS: Final = frozenset({"metadata", "mtime"})
 
 

codex/views/browser/force_update.py

@@ -0,0 +1,52 @@
+"""Force update browser view: re-import metadata for a filtered comic set."""
+
+from collections.abc import Sequence
+from types import MappingProxyType
+from typing import override
+
+from drf_spectacular.utils import extend_schema
+from rest_framework.permissions import BasePermission, IsAdminUser
+from rest_framework.response import Response
+
+from codex.librarian.mp_queue import LIBRARIAN_QUEUE
+from codex.librarian.scribe.tasks import ForceUpdateComicsTask
+from codex.models.comic import Comic
+from codex.serializers.mixins import OKSerializer
+from codex.views.browser.filters.filter import BrowserFilterView
+
+
+class ForceUpdateView(BrowserFilterView):
+    """Force a metadata re-import for every comic under a group + filters."""
+
+    permission_classes: Sequence[type[BasePermission]] = (IsAdminUser,)
+    serializer_class = OKSerializer
+    TARGET: str = "force_update"
+
+    def __init__(self, *args, **kwargs) -> None:
+        """Init acl properties."""
+        super().__init__(*args, **kwargs)
+        self.init_group_acl()
+
+    @property
+    @override
+    def params(self):
+        """Retrieve params from the request without saving them to settings."""
+        if self._params is None:
+            params = self.load_params_from_settings()
+            self._params = MappingProxyType(params)
+        return self._params
+
+    @extend_schema(request=None, responses=serializer_class)
+    def post(self, *_args, **_kwargs) -> Response:
+        """Enqueue a force-update task for every comic matching the filters."""
+        group = self.kwargs.get("group")
+        pks = self.kwargs.get("pks")
+        comic_pks = frozenset(
+            self.get_filtered_queryset(Comic, group=group, pks=pks).values_list(
+                "pk", flat=True
+            )
+        )
+        if comic_pks:
+            task = ForceUpdateComicsTask(comic_pks=comic_pks)
+            LIBRARIAN_QUEUE.put(task)
+        return Response()

eslint.config.js

@@ -45,6 +45,7 @@ export default defineConfig([
           ignoreContent: [
             "notify_groups_changed",
             "notify_failed_imports_changed",
+            "ForceUpdateConfirmDialog",
           ],
         },
       ],