codex 1.4.0a1__py3-none-any.whl → 1.4.1__py3-none-any.whl

codex/static_root/staticfiles.json

@@ -1 +1 @@
-{"paths": {"rest_framework/docs/css/highlight.css": "rest_framework/docs/css/highlight.e0e4d973c6d7.css", "rest_framework/docs/css/base.css": "rest_framework/docs/css/base.e630f8f4990e.css", "rest_framework/docs/css/jquery.json-view.min.css": "rest_framework/docs/css/jquery.json-view.min.a2e6beeb6710.css", "rest_framework/docs/img/favicon.ico": "rest_framework/docs/img/favicon.5195b4d0f3eb.ico", "rest_framework/docs/img/grid.png": "rest_framework/docs/img/grid.a4b938cf382b.png", "rest_framework/docs/js/jquery.json-view.min.js": "rest_framework/docs/js/jquery.json-view.min.b7c2d6981377.js", "rest_framework/docs/js/api.js": "rest_framework/docs/js/api.18a5ba8a1bd8.js", "rest_framework/docs/js/highlight.pack.js": "rest_framework/docs/js/highlight.pack.479b5f21dcba.js", "admin/css/codex-admin.css": "admin/css/codex-admin.7ad6b144bf84.css", "admin/css/codex-admin-dark.css": "admin/css/codex-admin-dark.4d45b3679935.css", "admin/css/queue-job.css": "admin/css/queue-job.bee4dbac67f1.css", "admin/js/queue-job.js": "admin/js/queue-job.628c5e325415.js", "rest_framework/css/default.css": "rest_framework/css/default.789dfb5732d7.css", "rest_framework/css/font-awesome-4.0.3.css": "rest_framework/css/font-awesome-4.0.3.c1e1ea213abf.css", "rest_framework/css/bootstrap.min.css": "rest_framework/css/bootstrap.min.f17d4516b026.css", "rest_framework/css/prettify.css": "rest_framework/css/prettify.a987f72342ee.css", "rest_framework/css/bootstrap-theme.min.css": "rest_framework/css/bootstrap-theme.min.1d4b05b397c3.css", "rest_framework/css/bootstrap-theme.min.css.map": "rest_framework/css/bootstrap-theme.min.css.51806092cc05.map", "rest_framework/css/bootstrap.min.css.map": "rest_framework/css/bootstrap.min.css.cafbda9c0e9e.map", "rest_framework/css/bootstrap-tweaks.css": "rest_framework/css/bootstrap-tweaks.46ed116b0edd.css", "rest_framework/img/glyphicons-halflings.png": "rest_framework/img/glyphicons-halflings.90233c9067e9.png", "rest_framework/img/glyphicons-halflings-white.png": "rest_framework/img/glyphicons-halflings-white.9bbc6e960299.png", "rest_framework/img/grid.png": "rest_framework/img/grid.a4b938cf382b.png", "rest_framework/js/csrf.js": "rest_framework/js/csrf.969930007329.js", "rest_framework/js/jquery-3.5.1.min.js": "rest_framework/js/jquery-3.5.1.min.dc5e7f18c8d3.js", "rest_framework/js/prettify-min.js": "rest_framework/js/prettify-min.709bfcc456c6.js", "rest_framework/js/bootstrap.min.js": "rest_framework/js/bootstrap.min.2f34b630ffe3.js", "rest_framework/js/default.js": "rest_framework/js/default.5b08897dbdc3.js", "rest_framework/js/coreapi-0.1.1.js": "rest_framework/js/coreapi-0.1.1.e580e3854595.js", "rest_framework/js/ajax-form.js": "rest_framework/js/ajax-form.0ea6e6052ab5.js", "rest_framework/fonts/fontawesome-webfont.woff": "rest_framework/fonts/fontawesome-webfont.3293616ec0c6.woff", "rest_framework/fonts/glyphicons-halflings-regular.ttf": "rest_framework/fonts/glyphicons-halflings-regular.e18bbf611f2a.ttf", "rest_framework/fonts/fontawesome-webfont.svg": "rest_framework/fonts/fontawesome-webfont.83e37a11f9d7.svg", "rest_framework/fonts/fontawesome-webfont.eot": "rest_framework/fonts/fontawesome-webfont.8b27bc96115c.eot", "rest_framework/fonts/glyphicons-halflings-regular.eot": "rest_framework/fonts/glyphicons-halflings-regular.f4769f9bdb74.eot", "rest_framework/fonts/fontawesome-webfont.ttf": "rest_framework/fonts/fontawesome-webfont.dcb26c7239d8.ttf", "rest_framework/fonts/glyphicons-halflings-regular.woff": "rest_framework/fonts/glyphicons-halflings-regular.fa2772327f55.woff", "rest_framework/fonts/glyphicons-halflings-regular.svg": "rest_framework/fonts/glyphicons-halflings-regular.08eda92397ae.svg", "rest_framework/fonts/glyphicons-halflings-regular.woff2": "rest_framework/fonts/glyphicons-halflings-regular.448c34a56d69.woff2", "img/missing-cover.webp": "img/missing-cover.8c8c1d4f6782.webp", "img/logo-maskable-180.webp": "img/logo-maskable-180.201cbde62d55.webp", "img/logo-32.webp": "img/logo-32.dbb98f6dfde4.webp", "img/missing-page.svg": "img/missing-page.71bb10f7c72a.svg", "img/logo.svg": "img/logo.3fb129bfbd92.svg", "img/logo-maskable.svg": "img/logo-maskable.d618c2d7943f.svg", "pwa/offline.html": "pwa/offline.37a4206d79f0.html", "js/choices.json": "js/choices.6bfc2a3d293f.json", "js/choices-admin.json": "js/choices-admin.24cecf0a0568.json", "assets/admin-75c007ce.js": "assets/admin-75c007ce.199fccf24c8d.js", "assets/reader-d8534888.css": "assets/reader-d8534888.2821de925986.css", "assets/page-pdf-c603e996.js": "assets/page-pdf-c603e996.ab2d147c9ae1.js", "assets/browser-2c2380fd.js": "assets/browser-2c2380fd.8b515af7a743.js", "assets/materialdesignicons-webfont-80bb28b3.woff": "assets/materialdesignicons-webfont-80bb28b3.20b6ebf31bfa.woff", "assets/admin-drawer-panel-cce8c0aa.css": "assets/admin-drawer-panel-cce8c0aa.2c0814fa2a9b.css", "assets/metadata-dialog-785c4cfc.css": "assets/metadata-dialog-785c4cfc.694a251cda37.css", "assets/http-error-402decbe.js": "assets/http-error-402decbe.9ea8de1df13f.js", "assets/materialdesignicons-webfont-c1c004a9.woff2": "assets/materialdesignicons-webfont-c1c004a9.a295367092b3.woff2", "assets/admin-drawer-panel-a110c068.js": "assets/admin-drawer-panel-a110c068.edf187333272.js", "assets/reader-c2965a5f.js": "assets/reader-c2965a5f.b011260169f7.js", "assets/browser-7325db61.css": "assets/browser-7325db61.ed2cfbf8e8ee.css", "assets/page-pdf-2d7d4f5d.css": "assets/page-pdf-2d7d4f5d.963cecd9ec4e.css", "assets/materialdesignicons-webfont-a58ecb54.ttf": "assets/materialdesignicons-webfont-a58ecb54.d10ac4ee5ebe.ttf", "assets/main-0898f4bb.css": "assets/main-0898f4bb.181e0145c642.css", "assets/metadata-dialog-8a0bd8e1.js": "assets/metadata-dialog-8a0bd8e1.c213b08d582f.js", "assets/admin-848d48b1.css": "assets/admin-848d48b1.5de8a0c45636.css", "assets/http-error-40ce966f.css": "assets/http-error-40ce966f.1c7337ad6e1d.css", "assets/main-a7f327e9.js": "assets/main-a7f327e9.6641fe833335.js", "assets/materialdesignicons-webfont-67d24abe.eot": "assets/materialdesignicons-webfont-67d24abe.5ce4e52cebe3.eot", "robots.txt": "robots.b6216d61c03e.txt", "manifest.json": "manifest.c0e270b2e6b6.json"}, "version": "1.1", "hash": "3abae4f43488"}
+{"paths": {"rest_framework/docs/css/highlight.css": "rest_framework/docs/css/highlight.e0e4d973c6d7.css", "rest_framework/docs/css/base.css": "rest_framework/docs/css/base.e630f8f4990e.css", "rest_framework/docs/css/jquery.json-view.min.css": "rest_framework/docs/css/jquery.json-view.min.a2e6beeb6710.css", "rest_framework/docs/img/favicon.ico": "rest_framework/docs/img/favicon.5195b4d0f3eb.ico", "rest_framework/docs/img/grid.png": "rest_framework/docs/img/grid.a4b938cf382b.png", "rest_framework/docs/js/jquery.json-view.min.js": "rest_framework/docs/js/jquery.json-view.min.b7c2d6981377.js", "rest_framework/docs/js/api.js": "rest_framework/docs/js/api.18a5ba8a1bd8.js", "rest_framework/docs/js/highlight.pack.js": "rest_framework/docs/js/highlight.pack.479b5f21dcba.js", "admin/css/codex-admin.css": "admin/css/codex-admin.7ad6b144bf84.css", "admin/css/codex-admin-dark.css": "admin/css/codex-admin-dark.4d45b3679935.css", "admin/css/queue-job.css": "admin/css/queue-job.bee4dbac67f1.css", "admin/js/queue-job.js": "admin/js/queue-job.628c5e325415.js", "rest_framework/css/default.css": "rest_framework/css/default.789dfb5732d7.css", "rest_framework/css/font-awesome-4.0.3.css": "rest_framework/css/font-awesome-4.0.3.c1e1ea213abf.css", "rest_framework/css/bootstrap.min.css": "rest_framework/css/bootstrap.min.f17d4516b026.css", "rest_framework/css/prettify.css": "rest_framework/css/prettify.a987f72342ee.css", "rest_framework/css/bootstrap-theme.min.css": "rest_framework/css/bootstrap-theme.min.1d4b05b397c3.css", "rest_framework/css/bootstrap-theme.min.css.map": "rest_framework/css/bootstrap-theme.min.css.51806092cc05.map", "rest_framework/css/bootstrap.min.css.map": "rest_framework/css/bootstrap.min.css.cafbda9c0e9e.map", "rest_framework/css/bootstrap-tweaks.css": "rest_framework/css/bootstrap-tweaks.46ed116b0edd.css", "rest_framework/img/glyphicons-halflings.png": "rest_framework/img/glyphicons-halflings.90233c9067e9.png", "rest_framework/img/glyphicons-halflings-white.png": "rest_framework/img/glyphicons-halflings-white.9bbc6e960299.png", "rest_framework/img/grid.png": "rest_framework/img/grid.a4b938cf382b.png", "rest_framework/js/csrf.js": "rest_framework/js/csrf.969930007329.js", "rest_framework/js/jquery-3.5.1.min.js": "rest_framework/js/jquery-3.5.1.min.dc5e7f18c8d3.js", "rest_framework/js/prettify-min.js": "rest_framework/js/prettify-min.709bfcc456c6.js", "rest_framework/js/bootstrap.min.js": "rest_framework/js/bootstrap.min.2f34b630ffe3.js", "rest_framework/js/default.js": "rest_framework/js/default.5b08897dbdc3.js", "rest_framework/js/coreapi-0.1.1.js": "rest_framework/js/coreapi-0.1.1.e580e3854595.js", "rest_framework/js/ajax-form.js": "rest_framework/js/ajax-form.0ea6e6052ab5.js", "rest_framework/fonts/fontawesome-webfont.woff": "rest_framework/fonts/fontawesome-webfont.3293616ec0c6.woff", "rest_framework/fonts/glyphicons-halflings-regular.ttf": "rest_framework/fonts/glyphicons-halflings-regular.e18bbf611f2a.ttf", "rest_framework/fonts/fontawesome-webfont.svg": "rest_framework/fonts/fontawesome-webfont.83e37a11f9d7.svg", "rest_framework/fonts/fontawesome-webfont.eot": "rest_framework/fonts/fontawesome-webfont.8b27bc96115c.eot", "rest_framework/fonts/glyphicons-halflings-regular.eot": "rest_framework/fonts/glyphicons-halflings-regular.f4769f9bdb74.eot", "rest_framework/fonts/fontawesome-webfont.ttf": "rest_framework/fonts/fontawesome-webfont.dcb26c7239d8.ttf", "rest_framework/fonts/glyphicons-halflings-regular.woff": "rest_framework/fonts/glyphicons-halflings-regular.fa2772327f55.woff", "rest_framework/fonts/glyphicons-halflings-regular.svg": "rest_framework/fonts/glyphicons-halflings-regular.08eda92397ae.svg", "rest_framework/fonts/glyphicons-halflings-regular.woff2": "rest_framework/fonts/glyphicons-halflings-regular.448c34a56d69.woff2", "img/missing-cover.webp": "img/missing-cover.8c8c1d4f6782.webp", "img/logo-maskable-180.webp": "img/logo-maskable-180.201cbde62d55.webp", "img/logo-32.webp": "img/logo-32.dbb98f6dfde4.webp", "img/missing-page.svg": "img/missing-page.71bb10f7c72a.svg", "img/logo.svg": "img/logo.3fb129bfbd92.svg", "img/logo-maskable.svg": "img/logo-maskable.d618c2d7943f.svg", "pwa/offline.html": "pwa/offline.37a4206d79f0.html", "js/choices.json": "js/choices.8c58714cf5b2.json", "js/choices-admin.json": "js/choices-admin.24cecf0a0568.json", "assets/http-error-5e17b794.js": "assets/http-error-5e17b794.77ceeb2d4641.js", "assets/reader-36266549.js": "assets/reader-36266549.0b2cf1291f27.js", "assets/metadata-dialog-cb306ffd.css": "assets/metadata-dialog-cb306ffd.cc304996d7bb.css", "assets/admin-12749881.js": "assets/admin-12749881.ef0f50bac290.js", "assets/materialdesignicons-webfont-80bb28b3.woff": "assets/materialdesignicons-webfont-80bb28b3.20b6ebf31bfa.woff", "assets/admin-beda768d.css": "assets/admin-beda768d.a614eee46307.css", "assets/materialdesignicons-webfont-c1c004a9.woff2": "assets/materialdesignicons-webfont-c1c004a9.a295367092b3.woff2", "assets/metadata-dialog-62c29ce0.js": "assets/metadata-dialog-62c29ce0.8418785c0453.js", "assets/admin-drawer-panel-41c225cc.css": "assets/admin-drawer-panel-41c225cc.3f84583b435b.css", "assets/main-9e76a4c3.js": "assets/main-9e76a4c3.6844a407d14c.js", "assets/page-pdf-2d7d4f5d.css": "assets/page-pdf-2d7d4f5d.963cecd9ec4e.css", "assets/materialdesignicons-webfont-a58ecb54.ttf": "assets/materialdesignicons-webfont-a58ecb54.d10ac4ee5ebe.ttf", "assets/page-pdf-157ba97e.js": "assets/page-pdf-157ba97e.613d7c2beb77.js", "assets/main-0898f4bb.css": "assets/main-0898f4bb.181e0145c642.css", "assets/http-error-40ce966f.css": "assets/http-error-40ce966f.1c7337ad6e1d.css", "assets/materialdesignicons-webfont-67d24abe.eot": "assets/materialdesignicons-webfont-67d24abe.5ce4e52cebe3.eot", "assets/reader-7f004141.css": "assets/reader-7f004141.506eecc6954b.css", "assets/browser-af622672.js": "assets/browser-af622672.d51aca96d64d.js", "assets/browser-7f7d7134.css": "assets/browser-7f7d7134.0fe3749b0f2f.css", "assets/admin-drawer-panel-522f1e6c.js": "assets/admin-drawer-panel-522f1e6c.089d70878270.js", "robots.txt": "robots.b6216d61c03e.txt", "manifest.json": "manifest.d2f93a519ada.json"}, "version": "1.1", "hash": "d46bd0e7f8fb"}

codex/templates/headers-script-globals.html

@@ -6,7 +6,7 @@
     LAST_ROUTE: {{ last_route | safe }},
     MISSING_COVER: "{% static 'img/missing-cover.webp' %}",
     MISSING_PAGE: "{% static 'img/missing-page.svg' %}",
-    OPDS_V1_PATH: "{% url 'opds:v1:browser' 'r' 0 1 %}",
+    OPDS_V1_PATH: "{% url 'opds:v1:feed' 'r' 0 1 %}",
     OPDS_V2_PATH: "{% url 'opds:v2:feed' 'r' 0 1 %}",
   };
   Object.freeze(CODEX);

codex/templates/{opds → opds_v1}/index.xml

@@ -7,7 +7,9 @@
   xmlns:dc="http://purl.org/dc/terms/"
   xmlns:thr="http://purl.org/syndication/thread/1.0"
   xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
-  xmlns:pse="http://vaemendis.net/opds-pse/ns"
+  {% if is_acquisition %}
+    xmlns:pse="http://vaemendis.net/opds-pse/ns"
+  {% endif %}
   >
 <id>{{ id_tag }}</id>
 <icon>{% static 'img/logo-32.webp' %}</icon>

codex/templates/{opds/opensearch.xml → opds_v1/opensearch_v1.xml}

@@ -6,5 +6,5 @@
 <InputEncoding>UTF-8</InputEncoding>
 <OutputEncoding>UTF-8</OutputEncoding>
 <Image width="512" height="512" type="image/svg+xml">{% static 'img/logo.svg' %}</Image>
-<Url type="application/atom+xml;profile=opds-catalog;kind=acquisition" template="{% url 'opds:v1:browser' 's' 0 1 %}?q={searchTerms}"/>
+<Url type="application/atom+xml;profile=opds-catalog;kind=acquisition" template="{% url 'opds:v1:feed' 's' 0 1 %}?q={searchTerms}"/>
 </OpenSearchDescription>

codex/templates/search/indexes/codex/comic_text.txt

@@ -27,8 +27,8 @@
 {% for series_group in object.series_groups.all %}
   {{ series_group.name }}
 {% endfor %}
-{% for story_arc in object.story_arcs.all %}
-  {{ story_arc.name }}
+{% for story_arc_number in object.story_arc_numbers.all %}
+  {{ story_arc_number.story_arc.name }}
 {% endfor %}
 {% for tag in object.tags.all %}
   {{ tag.name }}

codex/urls/converters.py

@@ -5,4 +5,4 @@ from django.urls.converters import StringConverter
 class GroupConverter(StringConverter):
     """Only accept valid browser groups."""
 
-    regex = "[rpisvcf]"
+    regex = "[rpisvcfa]"

codex/urls/opds/authentication.py

@@ -11,7 +11,7 @@ app_name = "authentication"
 
 urlpatterns = [
     path(
-        "/v1",
+        "v1",
         cache_page(TIMEOUT)(OPDSAuthentication1View.as_view()),
         name="v1",
     ),

codex/urls/opds/root.py

@@ -1,27 +1,23 @@
 """codex:opds URL Configuration."""
 from django.urls import include, path, re_path
 
-from codex.views.opds.v1.start import opds_1_start_view
-from codex.views.opds.v2.start import opds_2_start_view
+from codex.views.opds.util import full_redirect_view
 
 app_name = "opds"
 
+opds_v1_start_view = full_redirect_view("opds:v1:feed")
+
 urlpatterns = [
     path(
-        "authentication",
+        "authentication/",
         include("codex.urls.opds.authentication"),
         name="authentication",
     ),
-    path(
-        "opensearch",
-        include("codex.urls.opds.opensearch"),
-        name="opensearch",
-    ),
     path("bin/", include("codex.urls.opds.binary")),
     path("v1.2/", include("codex.urls.opds.v1")),
-    path("v1/", opds_1_start_view, name="v1_start"),
+    path("v1/", opds_v1_start_view, name="v1_start"),
     path("v2.0/", include("codex.urls.opds.v2")),
-    path("v2/", opds_2_start_view, name="v2_start"),
-    path("", opds_1_start_view, name="start"),
-    re_path(".*", opds_1_start_view, name="not_found"),
+    path("v2/", full_redirect_view("opds:v2:feed"), name="v2_start"),
+    path("", opds_v1_start_view, name="start"),
+    re_path(".*", opds_v1_start_view, name="not_found"),
 ]

codex/urls/opds/v1.py

@@ -1,8 +1,10 @@
 """codex:opds:v1 URL Configuration."""
 from django.urls import path
+from django.views.decorators.cache import cache_page
 
-from codex.views.opds.v1.browser import OPDS1BrowserView
-from codex.views.opds.v1.start import opds_1_start_view
+from codex.views.opds.util import full_redirect_view
+from codex.views.opds.v1.feed import OPDS1FeedView
+from codex.views.opds.v1.opensearch_v1 import OpenSearch1View
 
 TIMEOUT = 60 * 60
 
@@ -14,10 +16,15 @@ urlpatterns = [
     # Browser
     path(
         "<group:group>/<int:pk>/<int:page>",
-        OPDS1BrowserView.as_view(),
-        name="browser",
+        OPDS1FeedView.as_view(),
+        name="feed",
+    ),
+    path(
+        "opensearch/v1.1",
+        cache_page(TIMEOUT)(OpenSearch1View.as_view()),
+        name="opensearch_v1",
     ),
     #
     # Catch All
-    path("", opds_1_start_view, name="start"),
+    path("", full_redirect_view("opds:v1:feed"), name="start"),
 ]

codex/urls/opds/v2.py

@@ -1,8 +1,8 @@
 """codex:opds:v1 URL Configuration."""
 from django.urls import path
 
+from codex.views.opds.util import full_redirect_view
 from codex.views.opds.v2.feed import OPDS2FeedView
-from codex.views.opds.v2.start import opds_2_start_view
 
 app_name = "v2"
 
@@ -16,5 +16,5 @@ urlpatterns = [
     ),
     #
     # Catch All
-    path("", opds_2_start_view, name="start"),
+    path("", full_redirect_view("opds:v2:feed"), name="start"),
 ]

codex/views/bookmark.py

@@ -56,7 +56,7 @@ class BookmarkBaseView(GenericAPIView, GroupACLMixin):
 
     def _update_bookmarks(self, search_kwargs, updates):
         """Update existing bookmarks."""
-        group_acl_filter = self.get_group_acl_filter(False)
+        group_acl_filter = self.get_group_acl_filter(Bookmark)
         existing_bookmarks = (
             Bookmark.objects.filter(group_acl_filter)
             .filter(**search_kwargs)
@@ -82,7 +82,7 @@ class BookmarkBaseView(GenericAPIView, GroupACLMixin):
     ):
         """Create new bookmarks for comics that don't exist yet."""
         create_bookmarks = []
-        group_acl_filter = self.get_group_acl_filter(True)
+        group_acl_filter = self.get_group_acl_filter(Comic)
         create_bookmark_comics = (
             Comic.objects.filter(group_acl_filter)
             .filter(**comic_filter)

codex/views/browser/base.py

@@ -8,6 +8,7 @@ from djangorestframework_camel_case.settings import api_settings
 from djangorestframework_camel_case.util import underscoreize
 
 from codex.logger.logging import get_logger
+from codex.models import Comic, Folder, Imprint, Publisher, Series, StoryArc, Volume
 from codex.serializers.browser import BrowserSettingsSerializer
 from codex.views.browser.filters.bookmark import BookmarkFilterMixin
 from codex.views.browser.filters.field import ComicFieldFilter
@@ -24,6 +25,17 @@ class BrowserBaseView(
 
     input_serializer_class = BrowserSettingsSerializer
 
+    GROUP_MODEL_MAP = {
+        GroupFilterMixin.ROOT_GROUP: None,
+        "p": Publisher,
+        "i": Imprint,
+        "s": Series,
+        "v": Volume,
+        GroupFilterMixin.COMIC_GROUP: Comic,
+        GroupFilterMixin.FOLDER_GROUP: Folder,
+        GroupFilterMixin.STORY_ARC_GROUP: StoryArc,
+    }
+
     _GET_JSON_KEYS = frozenset(("filters", "show"))
 
     def __init__(self, *args, **kwargs):
@@ -39,22 +51,22 @@ class BrowserBaseView(
             self._is_admin = user and isinstance(user, User) and user.is_staff
         return self._is_admin
 
-    def get_query_filters_without_group(self, is_model_comic):
+    def get_query_filters_without_group(self, model):
         """Return all the filters except the group filter."""
-        object_filter = self.get_group_acl_filter(is_model_comic)
+        object_filter = self.get_group_acl_filter(model)
 
-        search_filter, search_scores = self.get_search_filter(is_model_comic)
+        search_filter, search_scores = self.get_search_filter()
         object_filter &= search_filter
-        object_filter &= self.get_bookmark_filter(is_model_comic, None)
-        object_filter &= self.get_comic_field_filter(is_model_comic)
+        object_filter &= self.get_bookmark_filter(model)
+        object_filter &= self.get_comic_field_filter()
         return object_filter, search_scores
 
-    def get_query_filters(self, is_model_comic, choices=False):
+    def get_query_filters(self, model, choices=False):
         """Return the main object filter and the one for aggregates."""
         (
             object_filter,
             search_scores,
-        ) = self.get_query_filters_without_group(is_model_comic)
+        ) = self.get_query_filters_without_group(model)
 
         object_filter &= self.get_group_filter(choices)
 
@@ -91,3 +103,7 @@ class BrowserBaseView(
 
         serializer.is_valid(raise_exception=True)
         self.params.update(serializer.validated_data)
+
+    def set_rel_prefix(self, model):
+        """Set the relation prefix for most fields."""
+        self.rel_prefix = self.get_rel_prefix(model)

codex/views/browser/browser.py

@@ -20,6 +20,7 @@ from codex.models import (
     Library,
     Publisher,
     Series,
+    StoryArc,
     Timestamp,
     Volume,
 )
@@ -49,9 +50,11 @@ class BrowserView(BrowserAnnotationsView):
         Imprint: ("publisher",),
         Publisher: (None,),
         Folder: ("parent_folder",),
+        StoryArc: (None,),
     }
+    DEFAULT_ROUTE_NAME = "browser"
     _DEFAULT_ROUTE = {
-        "name": "browser",
+        "name": DEFAULT_ROUTE_NAME,
         "params": deepcopy(DEFAULTS["route"]),
     }
     _OPDS_M2M_RELS = (
@@ -59,7 +62,8 @@ class BrowserView(BrowserAnnotationsView):
         "genres",
         "locations",
         "series_groups",
-        "story_arcs",
+        "story_arc_numbers",
+        "story_arc_numbers__story_arc",
         "tags",
         "teams",
         "creators",
@@ -88,37 +92,16 @@ class BrowserView(BrowserAnnotationsView):
         return queryset.annotate(**group_names)
 
     def _add_annotations(self, queryset, model, search_scores):
-        """Annotations for display and sorting.
-
-        model is neccissary because this gets called twice by folder
-        view. once for folders, once for the comics.
-        """
-        is_model_comic = model == Comic
-        ##############################
-        # Annotate Common Aggregates #
-        ##############################
+        """Annotations for display and sorting."""
         queryset = self.annotate_common_aggregates(queryset, model, search_scores)
-        if not is_model_comic:
-            # EXTRA FILTER for empty group
-            queryset = queryset.filter(child_count__gt=0)
 
-        ##################
-        # Annotate Group #
-        ##################
+        # Annotate Group
         self.model_group = self._MODEL_GROUP_MAP[model]
         queryset = queryset.annotate(
             group=Value(self.model_group, CharField(max_length=1))
         )
-
-        #######################
-        # Sortable aggregates #
-        #######################
-        order_key = self.get_order_key()
-        order_func = self.get_aggregate_func(order_key, model)
-        queryset = queryset.annotate(order_value=order_func)
-
-        queryset = self._annotate_group_names(queryset, model)
-        return queryset
+        # Hoist Group Names
+        return self._annotate_group_names(queryset, model)
 
     def _get_model_group(self):
         """Get the group of the models to browse."""
@@ -127,7 +110,10 @@ class BrowserView(BrowserAnnotationsView):
         #   the child of the current nav group or 'c'
         group = self.kwargs["group"]
         if group == self.FOLDER_GROUP:
-            return self.FOLDER_GROUP
+            return group
+        if group == self.STORY_ARC_GROUP:
+            pk = self.kwargs["pk"]
+            return self.COMIC_GROUP if pk else group
         if group == self.valid_nav_groups[-1]:
             # special case for lowest valid group
             return self.COMIC_GROUP
@@ -148,7 +134,7 @@ class BrowserView(BrowserAnnotationsView):
         else:
             qs = self.model.objects.filter(object_filter)
             qs = self._add_annotations(qs, self.model, search_scores)
-            qs = self.get_order_by(self.model, qs)
+            qs = self.add_order_by(qs, self.model)
         return qs
 
     def _get_book_queryset(self, object_filter, search_scores):
@@ -157,7 +143,7 @@ class BrowserView(BrowserAnnotationsView):
         if self.model == Comic or group == self.FOLDER_GROUP:
             if group == self.FOLDER_GROUP:
                 comic_object_filter, comic_search_scores = self.get_query_filters(
-                    True, False
+                    self.model, False
                 )
             else:
                 comic_object_filter = object_filter
@@ -165,7 +151,9 @@ class BrowserView(BrowserAnnotationsView):
 
             qs = Comic.objects.filter(comic_object_filter)
             qs = self._add_annotations(qs, Comic, comic_search_scores)
-            qs = self.get_order_by(Comic, qs)
+            qs = self.add_order_by(qs, Comic)
+            if limit := self.params.get("limit"):
+                qs = qs[:limit]
         else:
             qs = Comic.objects.none()
         return qs
@@ -185,11 +173,17 @@ class BrowserView(BrowserAnnotationsView):
 
         return up_group, up_pk
 
+    def _get_story_arc_up_route(self):
+        """Get one level hierarchy."""
+        up_group = self.STORY_ARC_GROUP
+        up_group = 0 if self.group_instance else None
+        return self.STORY_ARC_GROUP, up_group
+
     def _set_group_instance(self):
         """Create group_class instance."""
         pk = self.kwargs.get("pk")
         self.group_instance: Optional[
-            Union[Folder, Publisher, Imprint, Series, Volume]
+            Union[Folder, Publisher, Imprint, Series, Volume, StoryArc]
         ] = None
         if not pk:
             return
@@ -321,7 +315,7 @@ class BrowserView(BrowserAnnotationsView):
             )
 
         if book_qs.count():
-            book_max_obj_per_page = self.MAX_OBJ_PER_PAGE - group_qs.count()
+            book_max_obj_per_page = max(0, self.MAX_OBJ_PER_PAGE - group_qs.count())
             page_counts = (num_pages, total_count, Comic)
             group_qs, num_pages, total_count = self._paginate_section(
                 group_qs, book_max_obj_per_page, page_counts
@@ -332,11 +326,11 @@ class BrowserView(BrowserAnnotationsView):
     def get_object(self):
         """Validate settings and get the querysets."""
         self._set_browse_model()
+        self.set_rel_prefix(self.model)
         self._set_group_instance()  # Placed up here to invalidate earlier
         # Create the main query with the filters
-        is_model_comic = self.model == Comic
         try:
-            object_filter, search_scores = self.get_query_filters(is_model_comic, False)
+            object_filter, search_scores = self.get_query_filters(self.model, False)
         except Folder.DoesNotExist:
             pk = self.kwargs.get("pk")
             self._raise_redirect(
@@ -356,6 +350,8 @@ class BrowserView(BrowserAnnotationsView):
         # get additional context
         if group == self.FOLDER_GROUP:
             up_group, up_pk = self._get_folder_up_route()
+        elif group == self.STORY_ARC_GROUP:
+            up_group, up_pk = self._get_story_arc_up_route()
         else:
             up_group, up_pk = self._get_browse_up_route()
         browser_page_title = self._get_browser_page_title()
@@ -459,9 +455,7 @@ class BrowserView(BrowserAnnotationsView):
 
         top_group = self.params["top_group"]
         if top_group != self.FOLDER_GROUP:
-            reason = f"top_group {top_group} doesn't match route {self.FOLDER_GROUP}"
-            settings_mask = {"top_group": self.FOLDER_GROUP}
-            self._raise_redirect({"group": self.FOLDER_GROUP}, reason, settings_mask)
+            self.params["top_group"] = self.FOLDER_GROUP
 
         # set valid folder nav groups
         self.valid_nav_groups = (self.FOLDER_GROUP,)
@@ -500,12 +494,25 @@ class BrowserView(BrowserAnnotationsView):
             reason = f"Redirect r with {pk=} to pk 0"
             self._raise_redirect({"pk": 0}, reason)
 
+    def _validate_story_arc_settings(self):
+        """Validate story arc settings."""
+        top_group = self.params["top_group"]
+        if top_group != self.STORY_ARC_GROUP:
+            self.params["top_group"] = self.STORY_ARC_GROUP
+
+    def _set_route_param(self):
+        """Set the route param."""
+        group = self.kwargs.get("group", "r")
+        pk = self.kwargs.get("pk", 0)
+        page = self.kwargs.get("page", 1)
+        self.params["route"] = {"group": group, "pk": pk, "page": page}
+
     def validate_settings(self):
         """Validate group and top group settings."""
         group = self.kwargs.get("group")
-        order_key = self.get_order_key()
+        self.set_order_key()
         enable_folder_view = False
-        if group == self.FOLDER_GROUP or order_key == "path":
+        if group == self.FOLDER_GROUP or self.order_key == "path":
             key = AdminFlag.FlagChoices.FOLDER_VIEW.value
             try:
                 enable_folder_view = AdminFlag.objects.only("on").get(key=key).on
@@ -515,11 +522,13 @@ class BrowserView(BrowserAnnotationsView):
 
         if group == self.FOLDER_GROUP:
             self._validate_folder_settings(enable_folder_view)
+        elif group == self.STORY_ARC_GROUP:
+            self._validate_story_arc_settings()
         else:
             self._validate_browser_group_settings()
 
         # Validate path sort
-        if order_key == "path" and not enable_folder_view:
+        if self.order_key == "path" and not enable_folder_view:
             pk = self.kwargs("pk")
             page = self.kwargs("page")
             route_changes = {"group": group, "pk": pk, "page": page}
@@ -532,6 +541,7 @@ class BrowserView(BrowserAnnotationsView):
         """Get browser settings."""
         self.parse_params()
         self.validate_settings()
+        self._set_route_param()
         data = self.get_object()
         serializer = self.get_serializer(data)
         self.save_params_to_session(self.params)