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

codex/static_root/manifest.json

@@ -1,46 +1,46 @@
 {
-  "_admin-73d93dc7.js": {
+  "_admin-12749881.js": {
     "css": [
-      "assets/admin-79555229.css"
+      "assets/admin-beda768d.css"
     ],
     "dynamicImports": [
       "src/browser.vue",
       "src/http-error.vue",
       "src/reader.vue",
-      "_admin-drawer-panel-64bcc083.js",
-      "_admin-drawer-panel-64bcc083.js"
+      "_admin-drawer-panel-522f1e6c.js",
+      "_admin-drawer-panel-522f1e6c.js"
     ],
-    "file": "assets/admin-73d93dc7.js"
+    "file": "assets/admin-12749881.js"
   },
-  "_admin-drawer-panel-64bcc083.js": {
+  "_admin-drawer-panel-522f1e6c.js": {
     "css": [
-      "assets/admin-drawer-panel-cce8c0aa.css"
+      "assets/admin-drawer-panel-41c225cc.css"
     ],
-    "file": "assets/admin-drawer-panel-64bcc083.js",
+    "file": "assets/admin-drawer-panel-522f1e6c.js",
     "imports": [
-      "_admin-73d93dc7.js"
+      "_admin-12749881.js"
     ],
     "isDynamicEntry": true
   },
-  "_metadata-dialog-8b0e8aaa.js": {
+  "_metadata-dialog-62c29ce0.js": {
     "css": [
-      "assets/metadata-dialog-785c4cfc.css"
+      "assets/metadata-dialog-cb306ffd.css"
     ],
-    "file": "assets/metadata-dialog-8b0e8aaa.js",
+    "file": "assets/metadata-dialog-62c29ce0.js",
     "imports": [
-      "_admin-73d93dc7.js"
+      "_admin-12749881.js"
     ]
   },
   "admin-drawer-panel.css": {
-    "file": "assets/admin-drawer-panel-cce8c0aa.css",
+    "file": "assets/admin-drawer-panel-41c225cc.css",
     "src": "admin-drawer-panel.css"
   },
   "admin.css": {
-    "file": "assets/admin-79555229.css",
+    "file": "assets/admin-beda768d.css",
     "src": "admin.css"
   },
   "metadata-dialog.css": {
-    "file": "assets/metadata-dialog-785c4cfc.css",
+    "file": "assets/metadata-dialog-cb306ffd.css",
     "src": "metadata-dialog.css"
   },
   "node_modules/@mdi/font/fonts/materialdesignicons-webfont.eot": {
@@ -60,17 +60,17 @@
     "src": "node_modules/@mdi/font/fonts/materialdesignicons-webfont.woff2"
   },
   "src/browser.css": {
-    "file": "assets/browser-7325db61.css",
+    "file": "assets/browser-7f7d7134.css",
     "src": "src/browser.css"
   },
   "src/browser.vue": {
     "css": [
-      "assets/browser-7325db61.css"
+      "assets/browser-7f7d7134.css"
     ],
-    "file": "assets/browser-d2caeed7.js",
+    "file": "assets/browser-af622672.js",
     "imports": [
-      "_admin-73d93dc7.js",
-      "_metadata-dialog-8b0e8aaa.js"
+      "_admin-12749881.js",
+      "_metadata-dialog-62c29ce0.js"
     ],
     "isDynamicEntry": true,
     "src": "src/browser.vue"
@@ -83,9 +83,9 @@
     "css": [
       "assets/page-pdf-2d7d4f5d.css"
     ],
-    "file": "assets/page-pdf-abfd509d.js",
+    "file": "assets/page-pdf-157ba97e.js",
     "imports": [
-      "_admin-73d93dc7.js"
+      "_admin-12749881.js"
     ],
     "isDynamicEntry": true,
     "src": "src/components/reader/pages/page/page-pdf.vue"
@@ -98,15 +98,15 @@
     "css": [
       "assets/http-error-40ce966f.css"
     ],
-    "file": "assets/http-error-0221c37d.js",
+    "file": "assets/http-error-5e17b794.js",
     "imports": [
-      "_admin-73d93dc7.js"
+      "_admin-12749881.js"
     ],
     "isDynamicEntry": true,
     "src": "src/http-error.vue"
   },
   "src/main.css": {
-    "file": "assets/main-a6ac9581.css",
+    "file": "assets/main-0898f4bb.css",
     "src": "src/main.css"
   },
   "src/main.js": {
@@ -117,30 +117,30 @@
       "assets/materialdesignicons-webfont-a58ecb54.ttf"
     ],
     "css": [
-      "assets/main-a6ac9581.css"
+      "assets/main-0898f4bb.css"
     ],
-    "file": "assets/main-e33dcfb0.js",
+    "file": "assets/main-9e76a4c3.js",
     "imports": [
-      "_admin-73d93dc7.js"
+      "_admin-12749881.js"
     ],
     "isEntry": true,
     "src": "src/main.js"
   },
   "src/reader.css": {
-    "file": "assets/reader-a8b8f766.css",
+    "file": "assets/reader-7f004141.css",
     "src": "src/reader.css"
   },
   "src/reader.vue": {
     "css": [
-      "assets/reader-a8b8f766.css"
+      "assets/reader-7f004141.css"
     ],
     "dynamicImports": [
       "src/components/reader/pages/page/page-pdf.vue"
     ],
-    "file": "assets/reader-fe9345d2.js",
+    "file": "assets/reader-36266549.js",
     "imports": [
-      "_admin-73d93dc7.js",
-      "_metadata-dialog-8b0e8aaa.js"
+      "_admin-12749881.js",
+      "_metadata-dialog-62c29ce0.js"
     ],
     "isDynamicEntry": true,
     "src": "src/reader.vue"

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.3d958ea7f83b.json", "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/materialdesignicons-webfont-c1c004a9.woff2": "assets/materialdesignicons-webfont-c1c004a9.a295367092b3.woff2", "assets/page-pdf-abfd509d.js": "assets/page-pdf-abfd509d.3870dab8eaf4.js", "assets/main-e33dcfb0.js": "assets/main-e33dcfb0.a65044fc1a08.js", "assets/main-a6ac9581.css": "assets/main-a6ac9581.2fd9e52cbcc3.css", "assets/browser-7325db61.css": "assets/browser-7325db61.ed2cfbf8e8ee.css", "assets/admin-79555229.css": "assets/admin-79555229.5f2c4cb3a73c.css", "assets/browser-d2caeed7.js": "assets/browser-d2caeed7.2262000a6d55.js", "assets/metadata-dialog-8b0e8aaa.js": "assets/metadata-dialog-8b0e8aaa.d12b42b1c9da.js", "assets/page-pdf-2d7d4f5d.css": "assets/page-pdf-2d7d4f5d.963cecd9ec4e.css", "assets/materialdesignicons-webfont-a58ecb54.ttf": "assets/materialdesignicons-webfont-a58ecb54.d10ac4ee5ebe.ttf", "assets/http-error-40ce966f.css": "assets/http-error-40ce966f.1c7337ad6e1d.css", "assets/admin-drawer-panel-64bcc083.js": "assets/admin-drawer-panel-64bcc083.a85324c9ccd8.js", "assets/materialdesignicons-webfont-67d24abe.eot": "assets/materialdesignicons-webfont-67d24abe.5ce4e52cebe3.eot", "assets/reader-a8b8f766.css": "assets/reader-a8b8f766.875abdd0d22e.css", "assets/http-error-0221c37d.js": "assets/http-error-0221c37d.480d5066da92.js", "assets/admin-73d93dc7.js": "assets/admin-73d93dc7.2c3eb62e50a0.js", "assets/reader-fe9345d2.js": "assets/reader-fe9345d2.759c31f82998.js", "robots.txt": "robots.b6216d61c03e.txt", "manifest.json": "manifest.64a989215af8.json"}, "version": "1.1", "hash": "8a792210e869"}
+{"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/admin/tasks.py

@@ -5,7 +5,11 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.viewsets import ReadOnlyModelViewSet
 
-from codex.librarian.covers.tasks import CoverRemoveAllTask, CoverRemoveOrphansTask
+from codex.librarian.covers.tasks import (
+    CoverCreateAllTask,
+    CoverRemoveAllTask,
+    CoverRemoveOrphansTask,
+)
 from codex.librarian.janitor.tasks import (
     ForceUpdateAllFailedImportsTask,
     JanitorBackupTask,
@@ -55,6 +59,7 @@ class AdminLibrarianTaskView(APIView):
 
     _TASK_MAP = {
         "purge_comic_covers": CoverRemoveAllTask(),
+        "create_all_comic_covers": CoverCreateAllTask(),
         "search_index_update": SearchIndexUpdateTask(False),
         "search_index_rebuild": SearchIndexUpdateTask(True),
         "search_index_remove_stale": SearchIndexRemoveStaleTask(),

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)