codex 1.6.0a7__py3-none-any.whl → 1.6.0a9__py3-none-any.whl

codex/views/browser/metadata.py

@@ -8,7 +8,9 @@ from drf_spectacular.utils import extend_schema
 from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
 
-from codex.librarian.importer.const import COMIC_M2M_FIELD_NAMES
+from codex.librarian.importer.const import (
+    COMIC_M2M_FIELD_NAMES,
+)
 from codex.logger.logging import get_logger
 from codex.models import AdminFlag, Comic
 from codex.serializers.browser.metadata import MetadataSerializer
@@ -52,6 +54,11 @@ class MetadataView(BrowserAnnotationsView):
         }
     )
 
+    def set_valid_browse_nav_groups(self, valid_top_groups):  # noqa: ARG002
+        """Limited allowed nav groups for metadata."""
+        group = self.kwargs["group"]
+        self.valid_nav_groups = (group,)
+
     def _get_comic_value_fields(self):
         """Include the path field for staff."""
         fields = set(_COMIC_VALUE_FIELD_NAMES)
@@ -153,6 +160,8 @@ class MetadataView(BrowserAnnotationsView):
             if field_name in _GROUP_RELS:
                 group_by = "name" if field_name == "volume" else "sort_name"
                 intersection_qs = intersection_qs.group_by(group_by)
+            if field_name == "identifiers":
+                intersection_qs = intersection_qs.select_related("identifier_type")
             intersection_qs = intersection_qs.alias(count=Count("comic")).filter(
                 count=comic_pks_count
             )
@@ -185,18 +194,18 @@ class MetadataView(BrowserAnnotationsView):
     def _get_optimized_m2m_query(key, qs):
         # XXX The prefetch gets removed by field.set() :(
         if key == "contributors":
-            optimized_qs = qs.prefetch_related(*_CONTRIBUTOR_RELATIONS).only(
+            qs = qs.prefetch_related(*_CONTRIBUTOR_RELATIONS).only(
                 *_CONTRIBUTOR_RELATIONS
             )
         elif key == "story_arc_numbers":
-            optimized_qs = qs.prefetch_related("story_arc").only("story_arc", "number")
+            qs = qs.prefetch_related("story_arc")
+            qs = qs.only("story_arc", "number")
         elif key == "identifiers":
-            optimized_qs = qs.prefetch_related("identifier_type").only(
-                "identifier_type", "nss", "url"
-            )
+            qs = qs.prefetch_related("identifier_type")
+            qs = qs.only("identifier_type", "nss", "url")
         else:
-            optimized_qs = qs.only("name")
-        return optimized_qs
+            qs = qs.only("name")
+        return qs
 
     @classmethod
     def _copy_m2m_intersections(cls, obj, m2m_intersections):
@@ -244,26 +253,17 @@ class MetadataView(BrowserAnnotationsView):
         # values dicts don't copy relations to the serializer. The values
         # dict is necessary because of the folders view union in browser.py.
 
-        if self.model is None:
-            # TODO this looks redundant after set_browse_model
-            group = self.kwargs["group"]
-            raise NotFound(detail=f"Cannot get metadata for {group=}")
+        qs = self.get_filtered_queryset(self.model)
 
-        object_filter = self.get_query_filters_without_group(self.model)  # type: ignore
-        pks = self.kwargs["pks"]
-        qs = self.model.objects.filter(object_filter, pk__in=pks)
-        qs = self.filter_by_annotations(qs, self.model, binary=True)
         filtered_qs = qs
         qs = self.annotate_order_aggregates(qs, self.model)
         qs = self.annotate_card_aggregates(qs, self.model)
+        qs = self._annotate_values_and_fks(qs, filtered_qs)
         group_by = self.get_group_by()
         qs = qs.group_by(group_by)
-        qs = self._annotate_values_and_fks(qs, filtered_qs)
-
-        qs_list = self.re_cover_multi_groups(qs)
 
         try:
-            obj = qs_list[0]
+            obj = qs[0]
             if not obj:
                 reason = "Empty obj"
                 raise ValueError(reason)  # noqa TRY301
@@ -273,11 +273,6 @@ class MetadataView(BrowserAnnotationsView):
         m2m_intersections = self._query_m2m_intersections(filtered_qs)
         return self._copy_annotations_into_comic_fields(obj, m2m_intersections)  # type: ignore
 
-    def set_valid_browse_nav_groups(self, valid_top_groups):  # noqa: ARG002
-        """Limited allowed nav groups for metadata."""
-        group = self.kwargs["group"]
-        self.valid_nav_groups = (group,)
-
     @extend_schema(request=BrowserAnnotationsView.input_serializer_class)
     def get(self, *_args, **_kwargs):
         """Get metadata for a filtered browse group."""

codex/views/browser/mtime.py

@@ -0,0 +1,72 @@
+"""Get the mtimes for the submitted groups."""
+
+from types import MappingProxyType
+
+from rest_framework.response import Response
+
+from codex.logger.logging import get_logger
+from codex.models.groups import Publisher
+from codex.serializers.browser.mtime import GroupsMtimeSerializer, MtimeSerializer
+from codex.util import max_none
+from codex.views.browser.filters.annotations import BrowserAnnotationsFilterView
+from codex.views.const import GROUP_MODEL_MAP
+
+LOG = get_logger(__name__)
+
+
+class MtimeView(BrowserAnnotationsFilterView):
+    """Get the mtimes for the submitted groups."""
+
+    input_serializer_class = GroupsMtimeSerializer
+    serializer_class = MtimeSerializer
+
+    REPARSE_JSON_FIELDS = frozenset({"groups", "filters"})
+
+    def __init__(self, *args, **kwargs) -> None:
+        """Initialize."""
+        super().__init__(*args, **kwargs)
+        self.init_bookmark_data()
+
+    def parse_params(self):
+        """Parse GET params."""
+        try:
+            validated_data = super().parse_params()
+            params = dict(self.params)
+            params["groups"] = validated_data["groups"]  # type: ignore
+            self.params = MappingProxyType(params)
+
+        except Exception:
+            LOG.exception("parse")
+            raise
+
+    def _get_group_mtime(self, item):
+        """Get one group's mtimes."""
+        group = item["group"]
+        pks = item["pks"]
+
+        model = GROUP_MODEL_MAP[group]
+        if not model:
+            model = Publisher
+
+        return self.get_group_mtime(model, group, pks)
+
+    def get_max_groups_mtime(self):
+        """Get max mtime for all groups."""
+        max_mtime = None
+
+        for item in self.params["groups"]:  # type: ignore
+            mtime = self._get_group_mtime(item)
+            max_mtime = max_none(max_mtime, mtime)
+        return max_mtime
+
+    def get(self, *args, **kwargs):
+        """Get the mtimes for the submitted groups."""
+        # Parse Request
+        self.parse_params()
+
+        max_mtime = self.get_max_groups_mtime()
+
+        # Serialize Response
+        result = {"max_mtime": max_mtime}
+        serializer = self.get_serializer(result)
+        return Response(serializer.data)

codex/views/const.py

@@ -1,9 +1,12 @@
 """Common view constants."""
 
+from datetime import datetime, timezone
 from types import MappingProxyType
 
 from django.contrib.auth.models import Group, User
 from django.contrib.sessions.models import Session
+from django.db.models.expressions import Value
+from django.db.models.fields import DateTimeField, PositiveSmallIntegerField
 
 from codex.models import (
     AgeRating,
@@ -64,6 +67,18 @@ GROUP_RELATION = MappingProxyType(
         STORY_ARC_GROUP: "story_arc_numbers__story_arc",
     }
 )
+GROUP_ORDER = "rpisv"
+MODEL_REL_MAP = MappingProxyType(
+    {
+        Publisher: "publisher",
+        Imprint: "imprint",
+        Series: "series",
+        Volume: "volume",
+        Folder: "parent_folder",
+        StoryArc: "story_arc_numbers__story_arc",
+        Comic: "pk",
+    }
+)
 GROUP_MODEL_MAP: MappingProxyType[str, type[BrowserGroupModel] | None] = (
     MappingProxyType(
         {
@@ -115,3 +130,8 @@ CONFIG_MODELS = (
 )
 MAX_OBJ_PER_PAGE = 100
 GROUP_MTIME_MODEL_MAP = MappingProxyType({"r": Publisher, "a": StoryArc, "f": Folder})
+EPOCH_START = datetime.fromtimestamp(0, tz=timezone.utc)
+ONE_INTEGERFIELD = Value(1, PositiveSmallIntegerField())
+NONE_INTEGERFIELD = Value(None, PositiveSmallIntegerField())
+NONE_DATETIMEFIELD = Value(None, DateTimeField())
+EPOCH_START_DATETIMEFILED = Value(EPOCH_START)

codex/views/opds/binary.py

@@ -1,6 +1,6 @@
 """Binary views with Basic Authentication added."""
 
-from codex.views.cover import CoverView
+from codex.views.browser.cover import CoverView
 from codex.views.download import DownloadView
 from codex.views.opds.auth import OPDSAuthMixin
 from codex.views.reader.page import ReaderPageView

codex/views/opds/urls.py

@@ -6,6 +6,7 @@ from rest_framework.response import Response
 from codex.serializers.choices import DEFAULTS
 from codex.serializers.opds.urls import OPDSURLsSerializer
 from codex.views.auth import AuthGenericAPIView
+from codex.views.util import pop_name
 
 _OPDS_VERSIONS = (1, 2)
 
@@ -19,7 +20,7 @@ class OPDSURLsView(AuthGenericAPIView):
         """Resolve the urls."""
         obj = {}
         route = DEFAULTS["breadcrumbs"][0]
-        route.pop("name", None)
+        route = pop_name(route)
         for version in _OPDS_VERSIONS:
             key = f"v{version}"
             name = f"opds:v{version}:feed"

codex/views/opds/util.py

@@ -8,9 +8,9 @@ from django.utils.http import urlencode
 from codex.models import (
     Contributor,
     ContributorPerson,
-    StoryArc,
 )
 from codex.serializers.choices import DEFAULTS
+from codex.views.auth import GroupACLMixin
 from codex.views.opds.const import OPDS_M2M_MODELS
 
 
@@ -58,9 +58,7 @@ def get_m2m_objects(pks) -> dict:
     cats = {}
     for model in OPDS_M2M_MODELS:
         table = model.__name__.lower()
-        rel = "comic"
-        if model == StoryArc:
-            rel = "storyarcnumber__" + rel
+        rel = GroupACLMixin.get_rel_prefix(model)
         comic_filter = {rel + "__in": pks}
         qs = model.objects.filter(**comic_filter).order_by("name").only("name")
         cats[table] = qs

codex/views/opds/v1/entry/links.py

@@ -1,12 +1,12 @@
 """OPDS v1 Entry Links Methods."""
 
+from datetime import datetime
+from math import floor
 from urllib.parse import quote_plus
 
-from django.contrib.staticfiles.storage import staticfiles_storage
 from django.urls import reverse
 
 from codex.logger.logging import get_logger
-from codex.views.const import MISSING_COVER_FN, MISSING_COVER_NAME_MAP
 from codex.views.opds.const import MimeType, Rel
 from codex.views.opds.util import update_href_query_params
 from codex.views.opds.v1.data import OPDS1Link
@@ -31,39 +31,24 @@ class OPDS1EntryLinksMixin:
         self.mime_type_map = data.mime_type_map
         self.title_filename_fallback = title_filename_fallback
 
-    def _thumb_link(self):
+    def _cover_link(self, rel):
         if self.fake:
             return None
-        cover_pk = getattr(self.obj, "cover_pk", None)
-        if cover_pk:
-            kwargs = {"pk": cover_pk}
+        # cover_pk = getattr(self.obj, "cover_pk", None)
+        try:
+            kwargs = {"group": self.obj.group, "pks": self.obj.ids}
+            ts = floor(datetime.timestamp(self.obj.updated_at))
+            query_params = {
+                "customCovers": True,
+                "dynamicCovers": False,
+                "ts": ts,
+            }
             href = reverse("opds:bin:cover", kwargs=kwargs)
+            href = update_href_query_params(href, query_params)
             mime_type = "image/webp"
-        else:
-            cover_name = MISSING_COVER_NAME_MAP.get(self.obj.group)
-            cover_path = "img/"
-            if cover_name:
-                cover_path += cover_name + ".svg"
-                mime_type = "image/svg+xml"
-            else:
-                cover_path += MISSING_COVER_FN
-                mime_type = "image/webp"
-            href = staticfiles_storage.url(cover_path)
-        return OPDS1Link(Rel.THUMBNAIL, href, mime_type)
-
-    def _image_link(self):
-        if self.fake:
-            return None
-        cover_pk = getattr(self.obj, "cover_pk", None)
-        if cover_pk:
-            kwargs = {"pk": cover_pk, "page": 0}
-            href = reverse("opds:bin:page", kwargs=kwargs)
-            mime_type = "image/jpeg"
-        else:
-            fn = f"img/{MISSING_COVER_FN}"
-            href = staticfiles_storage.url(fn)
-            mime_type = "image/webp"
-        return OPDS1Link(Rel.IMAGE, href, mime_type)
+            return OPDS1Link(rel, href, mime_type)
+        except Exception:
+            LOG.exception("create thumb")
 
     def _nav_href(self, metadata=False):
         try:
@@ -149,9 +134,9 @@ class OPDS1EntryLinksMixin:
         """Create all entry links."""
         result = []
         try:
-            if thumb := self._thumb_link():
+            if thumb := self._cover_link(Rel.THUMBNAIL):
                 result += [thumb]
-            if image := self._image_link():
+            if image := self._cover_link(Rel.IMAGE):
                 result += [image]
 
             if self.obj.group == "c" and not self.fake:

codex/views/opds/v1/facets.py

@@ -12,6 +12,7 @@ from codex.views.opds.util import update_href_query_params
 from codex.views.opds.v1.data import OPDS1Link
 from codex.views.opds.v1.entry.data import OPDS1EntryData, OPDS1EntryObject
 from codex.views.opds.v1.entry.entry import OPDS1Entry
+from codex.views.util import pop_name
 
 
 @dataclass
@@ -89,7 +90,7 @@ class OPDS1FacetsView(BrowserView):
     obj = MappingProxyType({})
 
     def _facet(self, kwargs, facet_group, facet_title, new_query_params):
-        kwargs.pop("name", None)
+        kwargs = pop_name(kwargs)
         href = reverse("opds:v1:feed", kwargs=kwargs)
         facet_active = False
         for key, val in new_query_params.items():

codex/views/opds/v1/feed.py

@@ -41,13 +41,13 @@ class OpdsNs:
     ACQUISITION = "http://opds-spec.org/2010/acquisition"
 
 
-class UserAgentPrefixes:
+class UserAgentNames:
     """Control whether to hack in facets with nav links."""
 
-    CLIENT_REORDERS = ("Chunky",)
-    FACET_SUPPORT = ("yar",)  # kybooks
-    SIMPLE_DOWNLOAD_MIME_TYPES = ("PocketBook",)
-    # Other known valid  prefixes:
+    CLIENT_REORDERS = frozenset({"Chunky"})
+    FACET_SUPPORT = frozenset({"yar"})  # kybooks
+    SIMPLE_DOWNLOAD_MIME_TYPES = frozenset({"PocketBook Reader"})
+    # Other known valid  names:
     # "Panels", "Chunky"
 
 
@@ -168,14 +168,17 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
 
     def _ensure_page_counts(self):
         """Ensure page counts on books with just in time comicbox."""
+        if self.admin_flags.get("import_metadata"):
+            return
         books_qs: QuerySet = self.obj["books"]  # type: ignore
         import_pks = set()
         new_books = []
         for book in books_qs:
-            if not book.page_count:
-                with Comicbox(book.path) as cb:
-                    book.file_type = cb.get_file_type()
-                    book.page_count = cb.get_page_count()
+            if book.page_count is not None:
+                continue
+            with Comicbox(book.path) as cb:
+                book.file_type = cb.get_file_type()
+                book.page_count = cb.get_page_count()
             new_books.append(book)
             import_pks.add(book.pk)
         if new_books:
@@ -187,7 +190,24 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
 
     def get_object(self):  # type: ignore
         """Get the browser page and serialize it for this subclass."""
-        self.obj = super().get_object()
+        group_qs, book_qs, num_pages, total_count, zero_pad, mtime = (
+            super()._get_group_and_books()
+        )
+        book_qs = book_qs.select_related("series", "volume", "language")
+
+        title = self.get_browser_page_title()
+        self.obj = MappingProxyType(
+            {
+                "title": title,
+                "groups": group_qs,
+                "books": book_qs,
+                "zero_pad": zero_pad,
+                "num_pages": num_pages,
+                "total_count": total_count,
+                "mtime": mtime,
+            }
+        )
+
         self.is_aq_feed = self.model_group in ("c", "f")
 
         self._ensure_page_counts()
@@ -197,22 +217,21 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
 
     def _set_user_agent_variables(self):
         """Set User Agent variables."""
-        # defaults in FacetsMixin
         user_agent = self.request.headers.get("User-Agent")
         if not user_agent:
             return
-        for prefix in UserAgentPrefixes.FACET_SUPPORT:
-            if user_agent.startswith(prefix):
-                self.use_facets = True
-                break
-        for prefix in UserAgentPrefixes.CLIENT_REORDERS:
-            if user_agent.startswith(prefix):
-                self.skip_order_facets = True
-                break
-        for prefix in UserAgentPrefixes.SIMPLE_DOWNLOAD_MIME_TYPES:
-            if user_agent.startswith(prefix):
-                self.mime_type_map = MimeType.SIMPLE_FILE_TYPE_MAP
-                break
+        user_agent_parts = user_agent.split("/", 1)
+        if user_agent_parts:
+            user_agent_name = user_agent_parts[0]
+        else:
+            return
+
+        if user_agent_name in UserAgentNames.FACET_SUPPORT:
+            self.use_facets = True
+        if user_agent_name in UserAgentNames.CLIENT_REORDERS:
+            self.skip_order_facets = True
+        if user_agent_name in UserAgentNames.SIMPLE_DOWNLOAD_MIME_TYPES:
+            self.mime_type_map = MimeType.SIMPLE_FILE_TYPE_MAP
 
     def set_opds_request_type(self):
         """Set the opds request type variables."""

codex/views/opds/v1/links.py

@@ -15,6 +15,7 @@ from codex.views.opds.v1.data import OPDS1Link
 from codex.views.opds.v1.entry.data import OPDS1EntryData, OPDS1EntryObject
 from codex.views.opds.v1.entry.entry import OPDS1Entry
 from codex.views.opds.v1.facets import OPDS1FacetsView
+from codex.views.util import pop_name
 
 LOG = get_logger(__name__)
 
@@ -129,7 +130,7 @@ class OPDS1LinksView(OPDS1FacetsView):
         """Create a link."""
         if query_params is None:
             query_params = self.request.GET
-        kwargs.pop("name", None)
+        kwargs = pop_name(kwargs)
         href = reverse("opds:v1:feed", kwargs=kwargs)
         href = update_href_query_params(href, query_params)
         return OPDS1Link(rel, href, mime_type)

codex/views/opds/v2/feed.py

@@ -175,32 +175,34 @@ class OPDS2FeedView(OPDSAuthMixin, OPDS2PublicationView):
 
     def get_object(self):
         """Get the browser page and serialize it for this subclass."""
-        browser_page = super().get_object()
-
+        group_qs, book_qs, num_pages, total_count, zero_pad, mtime = (
+            self._get_group_and_books()
+        )
+        title = self.get_browser_page_title()
         # convert browser_page into opds page
 
         # instance vars
-        self.is_aq_feed = browser_page.get("model_group") in ("c", "f")
-        self.num_pages = browser_page["num_pages"]
+        self.is_aq_feed = self.model_group in ("c", "f")
+        self.num_pages = num_pages
 
         # opds page
-        title = self._title(browser_page.get("title"))
-        number_of_items = browser_page["total_count"]
+        title = self._title(title)
+        number_of_items = total_count
         current_page = self.kwargs.get("page")
         up_route = self.get_last_route()
         links = self.get_links(up_route)
         facets = self._get_facets()
 
         # opds groups
-        page_groups = browser_page.get("groups")
-        page_books = browser_page.get("books")
-        zero_pad = browser_page["zero_pad"]
+        page_groups = group_qs
+        page_books = book_qs
         groups = self._get_groups(page_groups, page_books, title, zero_pad)
 
         return MappingProxyType(
             {
                 "metadata": {
                     "title": title,
+                    "modified": mtime,
                     "number_of_items": number_of_items,
                     "items_per_page": MAX_OBJ_PER_PAGE,
                     "current_page": current_page,

codex/views/opds/v2/links.py

@@ -10,6 +10,7 @@ from codex.views.browser.browser import BrowserView
 from codex.views.const import FALSY
 from codex.views.opds.const import MimeType, Rel
 from codex.views.opds.util import update_href_query_params
+from codex.views.util import pop_name
 
 
 @dataclass
@@ -69,7 +70,7 @@ class OPDS2LinksView(BrowserView):
         if "page" in kwargs and not self._href_page_validate(kwargs, data):
             return None
 
-        kwargs.pop("name", None)
+        kwargs = pop_name(kwargs)
         href = reverse(url_name, kwargs=kwargs)
         return self._href_update_query_params(href, data)
 

codex/views/opds/v2/publications.py

@@ -1,10 +1,10 @@
 """Publication Methods for OPDS v2.0 feed."""
 
+from datetime import datetime
+from math import floor
 from types import MappingProxyType
 from urllib.parse import quote_plus
 
-from django.contrib.staticfiles.storage import staticfiles_storage
-
 from codex.librarian.covers.create import CoverCreateMixin
 from codex.models import Comic
 from codex.views.opds.const import AUTHOR_ROLES, MimeType, Rel
@@ -32,39 +32,16 @@ class OPDS2PublicationView(OPDS2TopLinksView):
 
     is_opds_metadata = False
 
-    def _get_big_image_link(self, obj, cover_pk):
-        if cover_pk:
-            mime_type = MimeType.JPEG
-            url_name = "opds:bin:page"
-            href = None
-            min_page = 0
-            max_page = obj.max_page or 1
-        else:
-            mime_type = MimeType.WEBP
-            href = staticfiles_storage.url("img/missing_cover.webp")
-            url_name = None
-            min_page = None
-            max_page = None
-
-        kwargs = {"pk": obj.pk, "page": 0}
-        href_data = HrefData(
-            kwargs,
-            absolute_query_params=True,
-            url_name=url_name,
-            min_page=min_page,
-            max_page=max_page,
-        )
-        link_data = LinkData(Rel.IMAGE, href_data, href=href, mime_type=mime_type)
-        return self.link(link_data)
-
     def _images(self, obj):
         # Images
-        cover_pk = obj.cover_pk
-
-        kwargs = {"pk": cover_pk}
-        href_data = HrefData(
-            kwargs, url_name="opds:bin:cover", absolute_query_params=True
-        )
+        kwargs = {"group": obj.group, "pks": obj.ids}
+        ts = floor(datetime.timestamp(obj.updated_at))
+        query_params = {
+            "customCovers": True,
+            "dynamicCovers": False,
+            "ts": ts,
+        }
+        href_data = HrefData(kwargs, query_params, True, "opds:bin:cover")
         link_data = LinkData(
             Rel.THUMBNAIL,
             href_data,
@@ -75,7 +52,9 @@ class OPDS2PublicationView(OPDS2TopLinksView):
 
         cover_link = self.link(link_data)
 
-        image_link = self._get_big_image_link(obj, cover_pk)
+        link_data.rel = Rel.IMAGE
+
+        image_link = self.link(link_data)
 
         return [
             cover_link,

codex/views/public.py

@@ -2,7 +2,6 @@
 
 from rest_framework.generics import GenericAPIView
 from rest_framework.mixins import RetrieveModelMixin
-from rest_framework.parsers import JSONParser
 
 from codex.logger.logging import get_logger
 from codex.models import AdminFlag
@@ -21,7 +20,6 @@ _ADMIN_FLAG_KEYS = frozenset(
 class AdminFlagsView(GenericAPIView, RetrieveModelMixin):
     """Get admin flags relevant to auth."""
 
-    parser_classes = (JSONParser,)
     serializer_class = AuthAdminFlagsSerializer
     queryset = AdminFlag.objects.filter(key__in=_ADMIN_FLAG_KEYS).only("key", "on")