codex 1.6.0a10__py3-none-any.whl → 1.6.0a12__py3-none-any.whl

codex/views/browser/metadata.py

@@ -2,7 +2,6 @@
 
 from types import MappingProxyType
 
-from django.core.exceptions import FieldDoesNotExist
 from django.db.models import Count, IntegerField, Sum, Value
 from drf_spectacular.utils import extend_schema
 from rest_framework.exceptions import NotFound
@@ -15,6 +14,7 @@ from codex.logger.logging import get_logger
 from codex.models import AdminFlag, Comic
 from codex.models.functions import JsonGroupArray
 from codex.serializers.browser.metadata import PREFETCH_PREFIX, MetadataSerializer
+from codex.serializers.browser.settings import BrowserFilterChoicesInputSerilalizer
 from codex.views.browser.annotations import BrowserAnnotationsView
 from codex.views.const import METADATA_GROUP_RELATION
 
@@ -42,13 +42,28 @@ _COMIC_RELATED_VALUE_FIELDS = frozenset({"series__volume_count", "volume__issue_
 _PATH_GROUPS = frozenset({"c", "f"})
 _CONTRIBUTOR_RELATIONS = ("role", "person")
 _SUM_FIELDS = frozenset({"page_count", "size"})
-_GROUP_RELS = frozenset({"publisher", "imprint", "series", "volume"})
+_GROUP_RELS = MappingProxyType(
+    {
+        "i": ("publisher",),
+        "s": (
+            "publisher",
+            "imprint",
+        ),
+        "v": (
+            "publisher",
+            "imprint",
+            "series",
+        ),
+        "c": ("publisher", "imprint", "series", "volume"),
+    }
+)
 
 
 class MetadataView(BrowserAnnotationsView):
     """Comic metadata."""
 
     serializer_class = MetadataSerializer
+    input_serializer_class = BrowserFilterChoicesInputSerilalizer
     TARGET = "metadata"
     ADMIN_FLAG_VALUE_KEY_MAP = MappingProxyType(
         {
@@ -156,19 +171,15 @@ class MetadataView(BrowserAnnotationsView):
         pks = self.kwargs["pks"]
         group_filter = {rel: pks}
 
-        for field_name in _GROUP_RELS:
-            try:
-                field = self.model._meta.get_field(field_name)
-            except FieldDoesNotExist:
-                continue
+        for field_name in _GROUP_RELS.get(group, ()):
+            field = self.model._meta.get_field(field_name)
             model = field.related_model
             if not model:
                 continue
 
             qs = model.objects.filter(**group_filter)
             qs = qs.only("name").distinct()
-            group_by = self.get_group_by(model)
-            qs = qs.group_by(group_by)
+            qs = qs.group_by("name")
             qs = qs.annotate(ids=JsonGroupArray("id", distinct=True))
             qs = qs.values("ids", "name")
             groups[field_name] = qs
@@ -228,8 +239,7 @@ class MetadataView(BrowserAnnotationsView):
         if self.model and not self.is_model_comic:
             # move the name of the group to the correct field
             field = self.model.__name__.lower() + "_list"
-            group_obj = {"pk": obj.pk, "name": obj.name}
-            group_list = [group_obj]
+            group_list = self.model.objects.filter(pk__in=obj.ids).values("name")
             setattr(obj, field, group_list)
             obj.name = None
 
@@ -312,7 +322,7 @@ class MetadataView(BrowserAnnotationsView):
         m2m_intersections = self._query_m2m_intersections(filtered_qs)
         return self._copy_annotations_into_comic_fields(obj, groups, m2m_intersections)  # type: ignore
 
-    @extend_schema(parameters=[BrowserAnnotationsView.input_serializer_class])
+    @extend_schema(parameters=[input_serializer_class])
     def get(self, *_args, **_kwargs):
         """Get metadata for a filtered browse group."""
         # Init

codex/views/const.py

@@ -157,4 +157,4 @@ 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)
+EPOCH_START_DATETIMEFIELD = Value(EPOCH_START)

codex/views/reader/init.py

@@ -107,15 +107,19 @@ class ReaderInitView(SessionView):
         params["arc"] = arc
 
     def _parse_params(self):
-        data = self.request.GET
-        data = reparse_json_query_params(self.request.GET, _JSON_KEYS)
-        serializer = self.input_serializer_class(data=data)
-        serializer.is_valid(raise_exception=True)
-
-        params = deepcopy(_DEFAULT_PARAMS)
-        if serializer.validated_data:
-            params.update(serializer.validated_data)  # type: ignore
-        self._ensure_arc_contains_comic(params)
-        self._ensure_arc(params)
-
-        self.params = MappingProxyType(params)
+        try:
+            data = self.request.GET
+            data = reparse_json_query_params(self.request.GET, _JSON_KEYS)
+            serializer = self.input_serializer_class(data=data)
+            serializer.is_valid(raise_exception=True)
+
+            params = deepcopy(_DEFAULT_PARAMS)
+            if serializer.validated_data:
+                params.update(serializer.validated_data)  # type: ignore
+            self._ensure_arc_contains_comic(params)
+            self._ensure_arc(params)
+
+            self.params = MappingProxyType(params)
+        except Exception:
+            LOG.exception("validate")
+            raise

codex/views/reader/page.py

@@ -1,7 +1,9 @@
 """Views for reading comic books."""
 
+from io import BytesIO
+
 from comicbox.box import Comicbox
-from django.http import HttpResponse
+from django.http.response import StreamingHttpResponse
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import OpenApiParameter, extend_schema
 from rest_framework.exceptions import NotFound
@@ -11,9 +13,13 @@ from codex.logger.logging import get_logger
 from codex.models import Comic
 from codex.views.bookmark import BookmarkBaseView
 from codex.views.const import FALSY
+from codex.views.util import chunker
 
 LOG = get_logger(__name__)
 _PDF_MIME_TYPE = "application/pdf"
+# Most pages seem to be 2.5 Mb
+# largest pages I've seen were 9 Mb
+_PAGE_CHUNK_SIZE = (1024**2) * 3  # 3 Mb
 
 
 class IgnoreClientContentNegotiation(BaseContentNegotiation):
@@ -66,8 +72,12 @@ class ReaderPageView(BookmarkBaseView):
             content_type = _PDF_MIME_TYPE
         else:
             content_type = self.content_type
+
         with Comicbox(comic.path) as cb:
             page_image = cb.get_page_by_index(page, to_pixmap=to_pixmap)
+        if not page_image:
+            page_image = b""
+
         return page_image, content_type
 
     @extend_schema(
@@ -98,4 +108,5 @@ class ReaderPageView(BookmarkBaseView):
             LOG.warning(exc)
             raise NotFound(detail="comic page not found") from exc
         else:
-            return HttpResponse(page_image, content_type=content_type)
+            page_chunker = chunker(BytesIO(page_image), _PAGE_CHUNK_SIZE)
+            return StreamingHttpResponse(page_chunker, content_type=content_type)

codex/views/session.py

@@ -69,8 +69,10 @@ class SessionView(AuthFilterGenericAPIView, ABC):
                 "top_group": DEFAULTS["topGroup"],
             },
             READER_SESSION_KEY: {
+                "finish_on_last_page": DEFAULTS["finishOnLastPage"],
                 "fit_to": DEFAULTS["fitTo"],
-                "two_pages": False,
+                "two_pages": DEFAULTS["twoPages"],
+                "read_rtl_in_reverse": DEFAULTS["readRtlInReverse"],
                 "reading_direction": DEFAULTS["readingDirection"],
             },
         }

codex/views/util.py

@@ -10,6 +10,9 @@ from urllib.parse import unquote_plus
 from djangorestframework_camel_case.settings import api_settings
 from djangorestframework_camel_case.util import underscoreize
 
+# Maximum cover size is around 24 Kb
+DEFAULT_CHUNK_SIZE = 64 * 1024  # 64 Kb
+
 
 @dataclass()
 class Route(dict):
@@ -62,3 +65,13 @@ def pop_name(kwargs: Mapping):
     kwargs = dict(kwargs)
     kwargs.pop("name", None)
     return kwargs
+
+
+async def chunker(open_file, chunk_size=DEFAULT_CHUNK_SIZE):
+    """Asynchronous iterator for serving files."""
+    while True:
+        chunk = open_file.read(chunk_size)
+        if not chunk:
+            open_file.close()
+            break
+        yield chunk

codex/websockets/consumers.py

@@ -48,6 +48,6 @@ class NotifierConsumer(AsyncWebsocketConsumer):
         """Send message to client."""
         text = event.get("text")
         if not text:
-            LOG.warning("No text in message")
+            LOG.warning(f"No text in websockets message: {event}")
             return
         await self.send(text)

{codex-1.6.0a10.dist-info → codex-1.6.0a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codex
-Version: 1.6.0a10
+Version: 1.6.0a12
 Summary: A comic archive web server.
 Home-page: https://github.com/ajslater/codex
 License: GPL-3.0-only