v0.11.0 (#184)

Author: ajslater

.circleci/config.yml

@@ -47,6 +47,9 @@ jobs:
       - run:
           command: ./docker/docker-build-image.sh codex-dist-builder
           name: Build Distribution Builder Image
+      - run:
+          command: ./docker/docker-compose-exit.sh codex-backend-lint
+          name: "Backend: Lint"
       - run:
           command: ./docker/docker-compose-exit.sh codex-frontend-lint
           name: "Frontend: Lint"
@@ -60,10 +63,7 @@ jobs:
           name: "Frontend: Build"
       - run:
           command: ./docker/docker-compose-exit.sh codex-backend-test
-          name: "Backend: Lint & Test"
-      - run:
-          command: ./docker/docker-compose-exit.sh codex-backend-lint
-          name: "Backend: Extra Linters"
+          name: "Backend: Test"
       - store_test_results:
           path: test-results/pytest
       - store_artifacts:

.gitignore

@@ -143,6 +143,7 @@ jspm_packages/
 .env
 .env-*
 .env.pushover
+.pypirc
 .venv
 .DS_Store
 build

NEWS.md

@@ -1,12 +1,25 @@
 # 📰 Codex News
 
+## v0.11.0
+
+- Features
+
+  - Librarian tasks in progress appear in the settings side drawer for adminstratiors.
+  - Covers are now created on demand by the browser, rather than on import.
+  - Browser Read filter.
+
+- Fixes
+
+  - Bookmark progress bar updates in browser after closing book.
+  - Metadata web links fix.
+
 ## v0.10.10
 
 - Features
 
   - Reader nav toolbar shows position in series.
 
-- Fix
+- Fixes
 
   - Fix inability to log in when Enable Non Users admin flag is unset.
   - Simplify Admin Library delete confirmation page to prevent OOM crash.

builder-requirements.txt

@@ -1 +1 @@
-poetry==1.1.13
+poetry==1.1.14

codex/admin.py

@@ -14,16 +14,11 @@
 from django.utils.html import format_html
 from django.utils.safestring import SafeText
 
-from codex.librarian.queue_mp import (
-    LIBRARIAN_QUEUE,
-    BroadcastNotifierTask,
-    CreateComicCoversLibrariesTask,
-    DelayedTasks,
-    PollLibrariesTask,
-    PurgeComicCoversLibrariesTask,
-    WatchdogSyncTask,
-)
+from codex.librarian.covers.tasks import CoverRemoveForLibrariesTask
+from codex.librarian.queue_mp import LIBRARIAN_QUEUE, DelayedTasks
+from codex.librarian.watchdog.tasks import WatchdogPollLibrariesTask, WatchdogSyncTask
 from codex.models import AdminFlag, FailedImport, Folder, Library
+from codex.notifier.tasks import LIBRARY_CHANGED_TASK
 from codex.settings.logging import get_logger
 
 
@@ -95,7 +90,7 @@ def _check_list_display_item(self, obj, item, label):
         ("Watchdog", {"fields": ("events", "poll", "poll_every", "last_poll")}),
         ("Auth", {"fields": ("groups",)}),
     )
-    actions = ("poll", "force_poll", "regen_comic_covers")
+    actions = ("poll", "force_poll", "remove_comic_covers")
     empty_value_display = "Never"
     list_display = (
         "path",
@@ -124,7 +119,7 @@ def get_queryset(self, request):
     def queue_poll(queryset, force):
         """Queue a poll task for the library."""
         pks = queryset.values_list("pk", flat=True)
-        task = PollLibrariesTask(pks, force)
+        task = WatchdogPollLibrariesTask(pks, force)
         LIBRARIAN_QUEUE.put(task)
 
     def poll(self, request, queryset):
@@ -139,17 +134,19 @@ def force_poll(self, request, queryset):
 
     force_poll.short_description = "Update all comics in selected libraries"
 
-    def regen_comic_covers(self, _, queryset):
+    def remove_comic_covers(self, _, queryset):
         """Regenerate all covers."""
         pks = queryset.values_list("pk", flat=True)
-        LIBRARIAN_QUEUE.put(CreateComicCoversLibrariesTask(pks))
+        LIBRARIAN_QUEUE.put(CoverRemoveForLibrariesTask(pks))
 
-    regen_comic_covers.short_description = "Recreate comic covers in selected libraries"
+    remove_comic_covers.short_description = (
+        "Remove comic covers from selected libraries"
+    )
 
     def _on_change(self, _, created=False):
         """Events for when the library has changed."""
         cache.clear()
-        tasks = (BroadcastNotifierTask("LIBRARY_CHANGED"), WatchdogSyncTask())
+        tasks = (LIBRARY_CHANGED_TASK, WatchdogSyncTask())
         task = DelayedTasks(2, tasks)
         LIBRARIAN_QUEUE.put(task)
 
@@ -169,7 +166,7 @@ def save_model(self, request, obj: Library, form, change):
     def delete_model(self, request, obj):
         """Stop watching on delete."""
         pks = frozenset([obj.pk])
-        task = PurgeComicCoversLibrariesTask(pks)
+        task = CoverRemoveForLibrariesTask(pks)
         LIBRARIAN_QUEUE.put(task)
         super().delete_model(request, obj)
         cache.clear()
@@ -178,9 +175,11 @@ def delete_model(self, request, obj):
     def delete_queryset(self, request, queryset):
         """Bulk delete."""
         pks = frozenset(queryset.values_list("pk", flat=True))
-        task = PurgeComicCoversLibrariesTask(pks)
+        task = CoverRemoveForLibrariesTask(pks)
         LIBRARIAN_QUEUE.put(task)
-        super().delete_queryset(request, queryset)
+        for library in queryset:
+            # so deletes will cascade
+            library.delete()
         cache.clear()
         self._on_change(None)
 
@@ -198,7 +197,6 @@ def get_deleted_objects(self, objs, request):
         perms_needed = set()
         protected = []
         return to_delete, model_count, perms_needed, protected
-        # return super().get_deleted_objects(objs, request)
 
 
 @register(AdminFlag)
@@ -230,8 +228,7 @@ def _on_change(self):
         # Heavy handed refresh everything, but simple.
         # Folder View could only change the group view and let the ui decide
         # Registration only needs to change the enable flag
-        task = BroadcastNotifierTask("LIBRARY_CHANGED")
-        LIBRARIAN_QUEUE.put(task)
+        LIBRARIAN_QUEUE.put(LIBRARY_CHANGED_TASK)
 
 
 @register(FailedImport)
@@ -267,7 +264,7 @@ def get_queryset(self, request):
     def poll(self, request, queryset):
         """Poll for new comics."""
         pks = queryset.values_list("library__pk", flat=True)
-        task = PollLibrariesTask(frozenset(pks), False)
+        task = WatchdogPollLibrariesTask(frozenset(pks), False)
         LIBRARIAN_QUEUE.put(task)
 
     poll.short_description = "Poll selected failed imports' libraries for changes"

codex/asgi.py

@@ -17,7 +17,6 @@
 
 # Must setup up the django environment before importing django models
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "codex.settings.settings")
-# os.environ["PYTHONASYNCIODEBUG"] = "1"
 connect_signals()
 django.setup()