ajslater
diff --git a/‎NEWS.md‎
Lines changed: 7 additions & 0 deletions b/‎NEWS.md‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎codex/librarian/librariand.py‎
Lines changed: 24 additions & 14 deletions b/‎codex/librarian/librariand.py‎
Lines changed: 24 additions & 14 deletions
diff --git a/‎codex/librarian/scribe/janitor/janitor.py‎
Lines changed: 39 additions & 39 deletions b/‎codex/librarian/scribe/janitor/janitor.py‎
Lines changed: 39 additions & 39 deletions
diff --git a/‎codex/serializers/browser/choices.py‎
Lines changed: 25 additions & 35 deletions b/‎codex/serializers/browser/choices.py‎
Lines changed: 25 additions & 35 deletions
diff --git a/‎codex/serializers/browser/filters.py‎
Lines changed: 29 additions & 25 deletions b/‎codex/serializers/browser/filters.py‎
Lines changed: 29 additions & 25 deletions
@@ -6,6 +6,13 @@ width: 128px;
 border-radius: 128px;
 " />
 
+## v1.9.20
+
+- Features
+    - Browser filters now show selected filters more clearly in the menus.
+    - Fix filtering on credits when clicking on metadata chips.
+    - OPDS v2 credits and subjects now link to views filtered on the tag.
+
 ## v1.9.19
 
 - Fixes
 
@@ -26,7 +26,7 @@
 from codex.librarian.scribe.scribed import ScribeThread
 from codex.librarian.scribe.search.tasks import SearchIndexSyncTask
 from codex.librarian.scribe.tasks import ScribeTask
-from codex.librarian.tasks import LibrarianShutdownTask, WakeCronTask
+from codex.librarian.tasks import LibrarianShutdownTask, LibrarianTask, WakeCronTask
 from codex.librarian.watchdog.event_batcherd import WatchdogEventBatcherThread
 from codex.librarian.watchdog.observers import (
     LibraryEventObserver,
@@ -52,6 +52,12 @@
     {snakecase(thread_class.__name__): thread_class for thread_class in _THREAD_CLASSES}
 )
 LibrarianThreads = NamedTuple("LibrarianThreads", tuple(_THREAD_CLASS_MAP.items()))  # ty: ignore[invalid-named-tuple]
+_THREAD_QUEUE_TASK_MAP: dict[type, str] = {
+    CoverTask: "cover_thread",
+    BookmarkTask: "bookmark_thread",
+    NotifierTask: "notifier_thread",
+    WatchdogEventTask: "watchdog_event_batcher_thread",
+}
 
 
 class LibrarianDaemon(Process):
@@ -75,31 +81,35 @@ def __init__(self, logger_, queue: Queue, broadcast_queue: AioQueue) -> None:
         self.run_loop = True
         self._reversed_threads = ()
 
-    def _process_task(self, task) -> None:  # noqa: C901
+    def _sync_watchdog_observers(self) -> None:
+        for observer in self._observers:
+            observer.sync_library_watches()
+
+    def _restart_codex(self, task: LibrarianTask) -> None:
+        restarter = CodexRestarter(self.log, self.queue, self.db_write_lock)
+        restarter.handle_task(task)
+
+    def _process_task(self, task) -> None:
         """Process an individual task popped off the queue."""
+        # Simply requeue tasks to the handler thread.
+        for task_type, thread_attr in _THREAD_QUEUE_TASK_MAP.items():
+            if isinstance(task, task_type):
+                getattr(self._threads, thread_attr).queue.put(task)
+            return
         match task:
-            case CoverTask():
-                self._threads.cover_thread.queue.put(task)
-            case BookmarkTask():
-                self._threads.bookmark_thread.queue.put(task)
-            case NotifierTask():
-                self._threads.notifier_thread.queue.put(task)
-            case WatchdogEventTask():
-                self._threads.watchdog_event_batcher_thread.queue.put(task)
             case ScribeTask():
+                # Special put method does queue put preprocessing.
                 self._threads.scribe_thread.put(task)
             case WatchdogSyncTask():
-                for observer in self._observers:
-                    observer.sync_library_watches()
+                self._sync_watchdog_observers()
             case WatchdogPollLibrariesTask():
                 self._threads.library_polling_observer.poll(
                     task.library_ids, force=task.force
                 )
             case WakeCronTask():
                 self._threads.cron_thread.end_timeout()
             case CodexRestarterTask():
-                restarter = CodexRestarter(self.log, self.queue, self.db_write_lock)
-                restarter.handle_task(task)
+                self._restart_codex(task)
             case LibrarianShutdownTask():
                 self.log.info(f"Shutting down {self.name}...")
                 self.run_loop = False
 
@@ -44,6 +44,7 @@
     SearchIndexOptimizeTask,
     SearchIndexSyncTask,
 )
+from codex.librarian.tasks import LibrarianTask
 from codex.models import Timestamp
 
 _JANITOR_STATII = (
@@ -67,6 +68,35 @@
     RemoveCoversStatus,
 )
 
+_NIGHTLY_TASK_CLASSES: tuple[type[LibrarianTask], ...] = (
+    CodexLatestVersionTask,
+    JanitorAdoptOrphanFoldersTask,
+    JanitorForeignKeyCheckTask,
+    JanitorIntegrityCheckTask,
+    JanitorFTSIntegrityCheckTask,
+    JanitorCleanFKsTask,
+    JanitorCleanCoversTask,
+    JanitorCleanupSessionsTask,
+    JanitorCleanupBookmarksTask,
+    SearchIndexSyncTask,
+    SearchIndexOptimizeTask,
+    JanitorVacuumTask,
+    JanitorBackupTask,
+    CoverRemoveOrphansTask,
+)
+_JANITOR_METHOD_MAP: dict[type, str] = {
+    JanitorVacuumTask: "vacuum_db",
+    JanitorCleanFKsTask: "cleanup_fks",
+    JanitorCleanCoversTask: "cleanup_custom_covers",
+    JanitorCleanupSessionsTask: "cleanup_sessions",
+    JanitorCleanupBookmarksTask: "cleanup_orphan_bookmarks",
+    JanitorImportForceAllFailedTask: "force_update_all_failed_imports",
+    JanitorForeignKeyCheckTask: "foreign_key_check",
+    JanitorFTSIntegrityCheckTask: "fts_integrity_check",
+    JanitorFTSRebuildTask: "fts_rebuild",
+    JanitorNightlyTask: "queue_nightly_tasks",
+}
+
 
 class Janitor(JanitorCodexUpdate):
     """Janitor inline task runner."""
@@ -75,56 +105,26 @@ def queue_nightly_tasks(self) -> None:
         """Queue all the janitor tasks."""
         try:
             self.status_controller.start_many(_JANITOR_STATII)
-            tasks = (
-                CodexLatestVersionTask(),
-                JanitorAdoptOrphanFoldersTask(),
-                JanitorForeignKeyCheckTask(),
-                JanitorIntegrityCheckTask(),
-                JanitorFTSIntegrityCheckTask(),
-                JanitorCleanFKsTask(),
-                JanitorCleanCoversTask(),
-                JanitorCleanupSessionsTask(),
-                JanitorCleanupBookmarksTask(),
-                SearchIndexSyncTask(),
-                SearchIndexOptimizeTask(),
-                JanitorVacuumTask(),
-                JanitorBackupTask(),
-                CoverRemoveOrphansTask(),
-            )
-            for task in tasks:
-                self.librarian_queue.put(task)
+            for task_class in _NIGHTLY_TASK_CLASSES:
+                self.librarian_queue.put(task_class())
             Timestamp.touch(Timestamp.Choices.JANITOR)
         except Exception:
             self.log.exception(f"In {self.__class__.__name__}")
 
-    def handle_task(self, task) -> None:  # noqa: PLR0912,C901
+    def handle_task(self, task) -> None:
         """Run Janitor tasks as the librarian process directly."""
         try:
+            # Simple task dispatch
+            if method_name := _JANITOR_METHOD_MAP.get(type(task)):
+                getattr(self, method_name)()
+                return
+
+            # Tasks with special parameters
             match task:
-                case JanitorVacuumTask():
-                    self.vacuum_db()
                 case JanitorBackupTask():
                     self.backup_db(show_status=True)
-                case JanitorCleanFKsTask():
-                    self.cleanup_fks()
-                case JanitorCleanCoversTask():
-                    self.cleanup_custom_covers()
-                case JanitorCleanupSessionsTask():
-                    self.cleanup_sessions()
-                case JanitorCleanupBookmarksTask():
-                    self.cleanup_orphan_bookmarks()
-                case JanitorImportForceAllFailedTask():
-                    self.force_update_all_failed_imports()
-                case JanitorForeignKeyCheckTask():
-                    self.foreign_key_check()
                 case JanitorIntegrityCheckTask():
                     self.integrity_check(long=task.long)
-                case JanitorFTSIntegrityCheckTask():
-                    self.fts_integrity_check()
-                case JanitorFTSRebuildTask():
-                    self.fts_rebuild()
-                case JanitorNightlyTask():
-                    self.queue_nightly_tasks()
                 case JanitorCodexUpdateTask():
                     self.update_codex(force=task.force)
                 case _:
 
@@ -5,7 +5,6 @@
 from rest_framework.fields import (
     BooleanField,
     CharField,
-    ListField,
     SerializerMethodField,
 )
 from rest_framework.serializers import Serializer
@@ -21,6 +20,7 @@
 from codex.serializers.fields.vuetify import (
     VuetifyFileTypeChoiceField,
     VuetifyReadingDirectionChoiceField,
+    VuetifyReadOnlyListField,
 )
 from codex.serializers.models.pycountry import CountrySerializer, LanguageSerializer
 
@@ -57,42 +57,32 @@ class BrowserSettingsFilterSerializer(Serializer):
 
     bookmark = BookmarkFilterField(required=False, read_only=True)
     # Dynamic filters
-    age_rating = ListField(child=VuetifyCharField(), required=False, read_only=True)
-    characters = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    country = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    credits = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    critical_rating = ListField(
-        child=VuetifyDecimalField(max_digits=5, decimal_places=2),
-        required=False,
-        read_only=True,
+    age_rating = VuetifyReadOnlyListField()
+    characters = VuetifyReadOnlyListField()
+    country = VuetifyReadOnlyListField()
+    credits = VuetifyReadOnlyListField()
+    critical_rating = VuetifyReadOnlyListField(
+        child=VuetifyDecimalField(max_digits=5, decimal_places=2)
     )
-    decade = ListField(child=VuetifyDecadeField(), required=False, read_only=True)
-    file_type = ListField(
-        child=VuetifyFileTypeChoiceField(), required=False, read_only=True
+    decade = VuetifyReadOnlyListField(child=VuetifyDecadeField)
+    file_type = VuetifyReadOnlyListField(child=VuetifyFileTypeChoiceField)
+    genres = VuetifyReadOnlyListField()
+    identifier_source = VuetifyReadOnlyListField()
+    language = VuetifyReadOnlyListField()
+    locations = VuetifyReadOnlyListField()
+    monochrome = VuetifyReadOnlyListField(child=VuetifyBooleanField)
+    original_format = VuetifyReadOnlyListField()
+    reading_direction = VuetifyReadOnlyListField(
+        child=VuetifyReadingDirectionChoiceField
     )
-    genres = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    identifier_source = ListField(
-        child=VuetifyCharField(), required=False, read_only=True
-    )
-    language = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    locations = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    monochrome = ListField(child=VuetifyBooleanField(), required=False, read_only=True)
-    original_format = ListField(
-        child=VuetifyCharField(), required=False, read_only=True
-    )
-    reading_direction = ListField(
-        child=VuetifyReadingDirectionChoiceField(), required=False, read_only=True
-    )
-    series_groups = ListField(
-        child=VuetifyIntegerField(), required=False, read_only=True
-    )
-    stories = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    story_arcs = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    tagger = ListField(child=VuetifyCharField(), required=False, read_only=True)
-    tags = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    teams = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    universes = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
-    year = ListField(child=VuetifyIntegerField(), required=False, read_only=True)
+    series_groups = VuetifyReadOnlyListField()
+    stories = VuetifyReadOnlyListField()
+    story_arcs = VuetifyReadOnlyListField()
+    tagger = VuetifyReadOnlyListField()
+    tags = VuetifyReadOnlyListField()
+    teams = VuetifyReadOnlyListField()
+    universes = VuetifyReadOnlyListField()
+    year = VuetifyReadOnlyListField()
 
 
 class BrowserChoicesIntegerPkSerializer(Serializer):
 
@@ -1,42 +1,46 @@
 """Browser Settings Filter Serializers."""
 
-from rest_framework.serializers import ListField, Serializer
+from rest_framework.serializers import Serializer
 
 from codex.serializers.fields import (
     VuetifyBooleanField,
     VuetifyDecadeField,
     VuetifyDecimalField,
-    VuetifyIntegerField,
 )
 from codex.serializers.fields.browser import BookmarkFilterField
+from codex.serializers.fields.vuetify import (
+    VuetifyFileTypeChoiceField,
+    VuetifyListField,
+    VuetifyReadingDirectionChoiceField,
+)
 
 
 class BrowserSettingsFilterInputSerializer(Serializer):
     """Filter values for settings."""
 
     bookmark = BookmarkFilterField(required=False)
     # Dynamic filters
-    age_rating = ListField(child=VuetifyIntegerField(), required=False)
-    characters = ListField(child=VuetifyIntegerField(), required=False)
-    country = ListField(child=VuetifyIntegerField(), required=False)
-    credits = ListField(child=VuetifyIntegerField(), required=False)
-    critical_rating = ListField(
-        child=VuetifyDecimalField(max_digits=5, decimal_places=2), required=False
+    age_rating = VuetifyListField()
+    characters = VuetifyListField()
+    country = VuetifyListField()
+    credits = VuetifyListField()
+    critical_rating = VuetifyListField(
+        child=VuetifyDecimalField(max_digits=5, decimal_places=2)
     )
-    decade = ListField(child=VuetifyDecadeField(), required=False)
-    file_type = ListField(child=VuetifyIntegerField(), required=False)
-    genres = ListField(child=VuetifyIntegerField(), required=False)
-    identifier_source = ListField(child=VuetifyIntegerField(), required=False)
-    language = ListField(child=VuetifyIntegerField(), required=False)
-    locations = ListField(child=VuetifyIntegerField(), required=False)
-    monochrome = ListField(child=VuetifyBooleanField(), required=False)
-    original_format = ListField(child=VuetifyIntegerField(), required=False)
-    reading_direction = ListField(child=VuetifyIntegerField(), required=False)
-    series_groups = ListField(child=VuetifyIntegerField(), required=False)
-    stories = ListField(child=VuetifyIntegerField(), required=False)
-    story_arcs = ListField(child=VuetifyIntegerField(), required=False)
-    tagger = ListField(child=VuetifyIntegerField(), required=False)
-    tags = ListField(child=VuetifyIntegerField(), required=False)
-    teams = ListField(child=VuetifyIntegerField(), required=False)
-    universes = ListField(child=VuetifyIntegerField(), required=False)
-    year = ListField(child=VuetifyIntegerField(), required=False)
+    decade = VuetifyListField(child=VuetifyDecadeField)
+    file_type = VuetifyListField(child=VuetifyFileTypeChoiceField)
+    genres = VuetifyListField()
+    identifier_source = VuetifyListField()
+    language = VuetifyListField()
+    locations = VuetifyListField()
+    monochrome = VuetifyListField(child=VuetifyBooleanField)
+    original_format = VuetifyListField()
+    reading_direction = VuetifyListField(child=VuetifyReadingDirectionChoiceField)
+    series_groups = VuetifyListField()
+    stories = VuetifyListField()
+    story_arcs = VuetifyListField()
+    tagger = VuetifyListField()
+    tags = VuetifyListField()
+    teams = VuetifyListField()
+    universes = VuetifyListField()
+    year = VuetifyListField()