codex 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

codex/views/browser/filters/search/parse.py

@@ -149,7 +149,7 @@ class SearchFilterView(BrowserFTSFilter):
 
     def _preparse_search_query(self):
         """Preparse search fields out of query text."""
-        text = self.params.get("q")  # type: ignore
+        text = self.params.get("q")
         field_tokens = {}
         if not text:
             return field_tokens, text
@@ -177,7 +177,7 @@ class SearchFilterView(BrowserFTSFilter):
                 )
             else:
                 # AND and OR
-                # XXX cannot do OR queries with MATCH, it decontextualizes MATCH somehow.
+                # Cannot do OR queries with MATCH, it decontextualizes MATCH somehow.
                 if preop == "or":
                     self.search_error = "OR preceding column tokens with operator expressions will act as AND"
                 include_q_list, exclude_q_list = self.get_search_field_filters(
@@ -227,24 +227,9 @@ class SearchFilterView(BrowserFTSFilter):
 
         return include_q, exclude_q, fts_q
 
-    def _is_search_results_limited(self) -> bool:
-        """Get search result limit from params."""
-        # user = self.request.user  # type: ignore
-        # if user and user.is_authenticated:
-        #    limited = bool(
-        #        self.params.get(  # type: ignore
-        #            "search_results_limit",
-        #            MAX_OBJ_PER_PAGE,
-        #        )
-        #    )
-        # else:
-        #    limited = True
-        # return limited
-        return True
-
     def get_search_limit(self):
         """Get search scores for choices and metadata."""
-        if not self.search_mode or not self._is_search_results_limited():
+        if not self.search_mode:
             return 0
-        page = self.kwargs.get("page", 1)  # type: ignore
+        page = self.kwargs.get("page", 1)
         return page * MAX_OBJ_PER_PAGE + 1

codex/views/browser/group_mtime.py

@@ -46,15 +46,15 @@ class BrowserGroupMtimeView(BrowserFilterView):
         self, model, agg_func: type[Aggregate] = Max, default=NONE_DATETIMEFIELD
     ):
         """Get filtered maximum bookmark updated_at relation."""
-        bm_rel = self._get_bm_rel(model)
-        bm_filter = self._get_my_bookmark_filter(bm_rel)
+        bm_rel = self.get_bm_rel(model)
+        bm_filter = self.get_my_bookmark_filter(bm_rel)
         bmua_rel = f"{bm_rel}__updated_at"
         args = {"default": default, "filter": bm_filter}
         if agg_func is JsonGroupArray:
             args["distinct"] = True
         return agg_func(bmua_rel, **args)
 
-    def get_group_mtime(self, model, group=None, pks=None, page_mtime=False):
+    def get_group_mtime(self, model, group=None, pks=None, page_mtime=False):  # noqa: FBT002
         """Get a filtered mtime for browser pages and mtime checker."""
         qs = self.get_filtered_queryset(
             model,

codex/views/browser/metadata/annotate.py

@@ -86,7 +86,7 @@ class MetadataAnnotateView(BrowserAnnotateCardView):
 
         return filtered_qs, qs
 
-    def _annotate_values_and_fks(self, qs, filtered_qs):
+    def annotate_values_and_fks(self, qs, filtered_qs):
         """Annotate comic values and comic foreign key values."""
         # Simple Values
         querysets = (filtered_qs, qs)

codex/views/browser/metadata/copy_intersections.py

@@ -47,7 +47,7 @@ class MetadataCopyIntersectionsView(MetadataQueryIntersectionsView):
     @classmethod
     def _copy_m2m_intersections(cls, obj, m2m_intersections):
         """Copy the m2m intersections into the object."""
-        # XXX It might even be faster to copy everything to a dict and not use the obj.
+        # It might even be faster to copy everything to a dict and not use the obj.
         for key, qs in m2m_intersections.items():
             serializer_key = (
                 f"{PREFETCH_PREFIX}{key}"

codex/views/browser/metadata/metadata.py

@@ -54,7 +54,7 @@ class MetadataView(MetadataCopyIntersectionsView):
         # Annotate
         qs = self.annotate_order_aggregates(qs)
         qs = self.annotate_card_aggregates(qs)
-        qs = self._annotate_values_and_fks(qs, filtered_qs)
+        qs = self.annotate_values_and_fks(qs, filtered_qs)
         qs = self.add_group_by(qs)
         qs = self.force_inner_joins(qs)
 
@@ -63,7 +63,7 @@ class MetadataView(MetadataCopyIntersectionsView):
             obj = qs[0]
             if not obj:
                 reason = "Empty obj"
-                raise ValueError(reason)  # noqa TRY301
+                raise ValueError(reason)  # noqa: TRY301
         except (IndexError, ValueError) as exc:
             return self._raise_not_found(exc)
 

codex/views/browser/mtime.py

@@ -37,7 +37,7 @@ class MtimeView(BrowserGroupMtimeView):
         """Get max mtime for all groups."""
         max_mtime = None
 
-        for item in self.params["groups"]:  # type: ignore
+        for item in self.params["groups"]:
             mtime = self._get_group_mtime(item)
             max_mtime = max_none(max_mtime, mtime)
         return max_mtime

codex/views/browser/order_by.py

@@ -19,7 +19,10 @@ class BrowserOrderByView(BrowserGroupMtimeView):
         if not self._order_key:
             order_key: str = self.params["order_by"]
             if (order_key == "search_score" and not self.fts_mode) or (
-                order_key == "filename" and not self.admin_flags["folder_view"]
+                order_key == "filename"
+                and not self.admin_flags["folder_view"]
+                or order_key == "child_count"
+                and self.TARGET == "cover"
             ):
                 order_key = "sort_name"
             self._order_key = order_key
@@ -29,6 +32,8 @@ class BrowserOrderByView(BrowserGroupMtimeView):
         """Order by for comics (and covers)."""
         if not order_key:
             order_key = self.order_key
+        if order_key == "child_count":
+            order_key = "sort_name"
         if order_key == "sort_name":
             if not comic_sort_names:
                 comic_sort_names = self._comic_sort_names
@@ -50,7 +55,7 @@ class BrowserOrderByView(BrowserGroupMtimeView):
                 order_fields_head += ["bookmark_updated_at"]
         return order_fields_head
 
-    def add_order_by(self, qs, order_key="", do_reverse=True, comic_sort_names=None):
+    def add_order_by(self, qs, order_key="", comic_sort_names=None):
         """Create the order_by list."""
         order_fields_head = ()
         if qs.model is Comic:
@@ -60,11 +65,9 @@ class BrowserOrderByView(BrowserGroupMtimeView):
 
         order_fields = (*order_fields_head, "pk")
 
-        prefix = "-" if do_reverse and self.params.get("order_reverse") else ""
-        order_by = []
+        prefix = "-" if self.params.get("order_reverse") else ""
         if prefix:
-            for field in order_fields:
-                order_by.append(prefix + field)
+            order_by = [prefix + field for field in order_fields]
         else:
             order_by = order_fields
 

codex/views/browser/params.py

@@ -58,7 +58,7 @@ class BrowserParamsView(SessionView):
             validated_data = serializer.validated_data
 
             if validated_data:
-                params.update(validated_data)  # type: ignore
+                params.update(validated_data)
             self._params = MappingProxyType(params)
             self.validate_settings()
         return self._params

codex/views/browser/settings.py

@@ -9,7 +9,7 @@ class BrowserSettingsView(SettingsView):
     """Get Browser Settings."""
 
     # Put Browser Settings is normally done through BrowserView.get()
-    serializer_class = BrowserSettingsSerializer  # type: ignore
+    serializer_class = BrowserSettingsSerializer
 
     SESSION_KEY = SettingsView.BROWSER_SESSION_KEY
 

codex/views/browser/validate.py

@@ -1,14 +1,17 @@
 """Browser Settings and URL Validation."""
 
+from collections.abc import Mapping
 from copy import deepcopy
 from types import MappingProxyType
+from typing import Any
 
 from rest_framework.exceptions import NotFound
 
-from codex.choices import DEFAULT_BROWSER_ROUTE, mapping_to_dict
+from codex.choices import DEFAULT_BROWSER_ROUTE
 from codex.exceptions import SeeOtherRedirectError
 from codex.logger.logging import get_logger
 from codex.models.groups import BrowserGroupModel
+from codex.util import mapping_to_dict
 from codex.views.browser.filters.search.parse import SearchFilterView
 from codex.views.const import (
     COMIC_GROUP,
@@ -67,19 +70,22 @@ class BrowserValidateView(SearchFilterView):
             self._rel_prefix = self.get_rel_prefix(self.model)
         return self._rel_prefix
 
-    def raise_redirect(self, reason, route_mask=None, settings_mask=None):
+    def raise_redirect(
+        self, reason, route_mask=None, settings_mask: Mapping | None = None
+    ):
         """Redirect the client to a valid group url."""
-        route = mapping_to_dict(self.DEFAULT_ROUTE)
+        route: dict[str, Any] = mapping_to_dict(self.DEFAULT_ROUTE)  # type:ignore[reportAssignmentType]
         if route_mask:
-            route["params"].update(route_mask)  # type: ignore
-        settings = deepcopy(dict(self.params))
+            route["params"].update(route_mask)
+        settings: dict[str, Any] = deepcopy(mapping_to_dict(self.params))  # type: ignore[reportAssignmentType]
         if settings_mask:
             settings.update(settings_mask)
         detail = {"route": route, "settings": settings, "reason": reason}
         raise SeeOtherRedirectError(detail=detail)
 
     def _get_valid_browse_top_groups(self):
-        """Get valid top groups for the current settings.
+        """
+        Get valid top groups for the current settings.
 
         Valid top groups are determined by the Browser Settings.
         """
@@ -114,7 +120,8 @@ class BrowserValidateView(SearchFilterView):
             self.raise_redirect(reason, route, settings_mask)
 
     def _get_valid_browse_nav_groups(self, valid_top_groups):
-        """Get valid nav groups for the current settings.
+        """
+        Get valid nav groups for the current settings.
 
         Valid nav groups are the top group and below that are also
         enabled in browser settings.

codex/views/const.py

@@ -76,9 +76,6 @@ METADATA_GROUP_RELATION = MappingProxyType(
     {
         **GROUP_NAME_MAP,
         COMIC_GROUP: "comic",
-        # Possible to list all groups in a non group view, but could get crazy.
-        # FOLDER_GROUP: "comic__folder",
-        # STORY_ARC_GROUP: "comic__story_arc_number__story_arc"
     }
 )
 CUSTOM_COVER_GROUP_RELATION = MappingProxyType(

codex/views/download.py

@@ -6,7 +6,7 @@ from django.http import FileResponse, Http404
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema
 
-from codex.models import Comic
+from codex.models.comic import Comic
 from codex.views.auth import AuthFilterAPIView
 
 
@@ -15,7 +15,7 @@ class DownloadView(AuthFilterAPIView):
 
     content_type = "application/vnd.comicbook+zip"
 
-    _AS_ATTACHMENT = True
+    AS_ATTACHMENT = True
 
     @extend_schema(responses={(200, content_type): OpenApiTypes.BINARY})
     def get(self, *_args, **kwargs):
@@ -45,13 +45,13 @@ class DownloadView(AuthFilterAPIView):
         filename = comic.get_filename()
         return FileResponse(
             comic_file,
-            as_attachment=self._AS_ATTACHMENT,
+            as_attachment=self.AS_ATTACHMENT,
             content_type=content_type,
             filename=filename,
         )
 
 
 class FileView(DownloadView):
-    """View a comic in the browser."""
+    """View a single comic in the browser."""
 
-    _AS_ATTACHMENT = False
+    AS_ATTACHMENT = False

codex/views/frontend.py

@@ -6,6 +6,7 @@ from rest_framework.permissions import AllowAny
 from rest_framework.renderers import TemplateHTMLRenderer
 from rest_framework.response import Response
 
+from codex.models.admin import AdminFlag
 from codex.serializers.route import RouteSerializer
 from codex.views.session import SessionView
 
@@ -16,13 +17,27 @@ class IndexView(SessionView):
     SESSION_KEY = SessionView.BROWSER_SESSION_KEY
 
     permission_classes = (AllowAny,)
-    renderer_classes: ClassVar[list] = [TemplateHTMLRenderer]  # type: ignore
+    renderer_classes: ClassVar[list] = [TemplateHTMLRenderer]  # type: ignore[reportIncompatibleVariableOverride]
     template_name = "index.html"
 
-    def get(self, *_args, **_kwargs):
-        """Get the app index page."""
+    def _get_last_route(self):
+        """Get the last route from the session."""
         last_route = self.get_last_route(name=False)
         serializer = RouteSerializer(last_route)
-        last_route = serializer.data
-        extra_context = {"last_route": last_route}
+        return serializer.data
+
+    def _get_title(self):
+        """Get the title from the banner text."""
+        bt_flag = AdminFlag.objects.get(key="BT")
+        title = "Codex"
+        if bt_flag.value:
+            title = bt_flag.value + " - " + title
+        return title
+
+    def get(self, *_args, **_kwargs):
+        """Get the app index page."""
+        extra_context = {
+            "last_route": self._get_last_route(),
+            "title": self._get_title(),
+        }
         return Response(extra_context)

codex/views/mixins.py

@@ -2,40 +2,46 @@
 
 from django.db.models.expressions import F
 
+from codex.logger.logging import get_logger
 from codex.models.comic import Comic, Imprint, Volume
+from codex.views.browser.filters.filter import BrowserFilterView
 from codex.views.const import GROUP_NAME_MAP
 
+LOG = get_logger(__name__)
 _SHOW_GROUPS = tuple(GROUP_NAME_MAP.keys())
+_GROUP_NAME_TARGETS = frozenset({"browser", "opds1", "opds2", "reader"})
+_VARIABLE_SHOW = "pi"
 
 
-class SharedAnnotationsMixin:
+class SharedAnnotationsMixin(BrowserFilterView):
     """Cross view annotation methods."""
 
     @staticmethod
-    def _get_order_groups(model_group, pks):
+    def _get_order_groups(parent_group, pks, show):
         """Annotate sort_name."""
-        if not pks or len(pks) > 1:
-            order_groups = _SHOW_GROUPS
-        elif model_group == "c":
+        if parent_group == "c":
             order_groups = ()
         else:
             for index, nav_group in enumerate(_SHOW_GROUPS):
-                if nav_group == model_group:
-                    order_groups = _SHOW_GROUPS[index + 1 :]
+                if nav_group in _VARIABLE_SHOW and not show.get(nav_group):
+                    continue
+                if nav_group == parent_group:
+                    watermark = index
+                    if pks and len(pks) == 1:
+                        watermark += 1
+                    order_groups = _SHOW_GROUPS[watermark:]
                     break
             else:
                 order_groups = _SHOW_GROUPS
         return order_groups
 
     @classmethod
-    def get_sort_name_annotations(cls, model, model_group, pks, show):
+    def get_sort_name_annotations(cls, model, parent_group, pks, show):
         """Annotate sort names for browser subclasses and reader."""
         sort_name_annotations = {}
         if model is Comic:
-            order_groups = cls._get_order_groups(model_group, pks)
+            order_groups = cls._get_order_groups(parent_group, pks, show)
             for order_group in order_groups:
-                if show and not show.get(order_group):
-                    continue
                 group_name = GROUP_NAME_MAP[order_group]
                 ann_name = f"{group_name}_sort_name"
                 name_field = "name" if group_name == "volume" else "sort_name"
@@ -49,8 +55,8 @@ class SharedAnnotationsMixin:
     def annotate_group_names(cls, qs):
         """Annotate name fields by hoisting them up."""
         # Optimized to only lookup what is used on the frontend
-        target = cls.TARGET  # type: ignore
-        if target not in frozenset({"browser", "opds1", "opds2", "reader"}):
+        target = cls.TARGET
+        if target not in _GROUP_NAME_TARGETS:
             return qs
         group_names = {}
         if qs.model is Comic:
@@ -69,20 +75,3 @@ class SharedAnnotationsMixin:
         elif qs.model is Imprint:
             group_names["publisher_name"] = F("publisher__name")
         return qs.annotate(**group_names)
-
-
-class BookmarkSearchMixin:
-    """Create Bookmark Search kwargs."""
-
-    @staticmethod
-    def get_bookmark_search_kwargs(auth_filter, comic_filter=None):
-        """Get the search kwargs for a user's authentication state."""
-        # search kwargs are relative to the bookmark object.
-        search_kwargs = {}
-        search_kwargs.update(auth_filter)
-
-        if comic_filter:
-            for key, value in comic_filter.items():
-                search_kwargs[f"comic__{key}"] = value
-
-        return search_kwargs

codex/views/opds/authentication_v1.py

@@ -40,7 +40,7 @@ _DOC = MappingProxyType(
                 "labels": {"login": "Username", "password": "Password"},
             },
             {
-                # XXX Out of spec type
+                # Out of spec type
                 "type": "cookie",
                 "links": [
                     {

codex/views/opds/const.py

@@ -28,6 +28,7 @@ class Rel:
     SORT_NEW = "http://opds-spec.org/sort/new"
     POPULAR = "http://opds-spec.org/sort/popular"
     FEATURED = "http://opds-spec.org/featured"
+    PROGRESSION = "http://www.cantook.com/api/progression"
     SELF = "self"
     START = "start"
     UP = "up"
@@ -47,16 +48,17 @@ class MimeType:
 
     ATOM = "application/atom+xml"
     _PROFILE_CATALOG = "profile=opds-catalog"
-    NAV = ";".join((ATOM, _PROFILE_CATALOG, "kind=navigation"))
-    ACQUISITION = ";".join((ATOM, _PROFILE_CATALOG, "kind=acquisition"))
-    ENTRY_CATALOG = ";".join((ATOM, "type=entry", _PROFILE_CATALOG))
+    NAV = f"{ATOM};{_PROFILE_CATALOG};kind=navigation"
+    ACQUISITION = f"{ATOM};{_PROFILE_CATALOG};kind=acquisition"
+    ENTRY_CATALOG = f"{ATOM};type=entry;{_PROFILE_CATALOG}"
     AUTHENTICATION = "application/opds-authentication+json"
     OPENSEARCH = "application/opensearchdescription+xml"
     STREAM = "image/jpeg"
     OPDS_JSON = "application/opds+json"
     OPDS_PUB = "application/opds-publication+json"
+    PROGRESSION = "application/vnd.readium.progression+json"
     BOOK = "http://schema.org/Book"
-    # COMIC = "https://schema.org/ComicStory"
+    # COMIC = "https://schema.org/ComicStory" unused
     JPEG = "image/jpeg"
     WEBP = "image/webp"
     HTML = "text/html"

codex/views/opds/util.py

@@ -31,7 +31,7 @@ def update_href_query_params(href, old_query_params, new_query_params=None):
     return href
 
 
-def get_contributor_people(comic_pks, roles, exclude=False):
+def get_contributor_people(comic_pks, roles, exclude):
     """Get contributors that are not authors."""
     people = ContributorPerson.objects.filter(
         contributor__comic__in=comic_pks,
@@ -43,7 +43,7 @@ def get_contributor_people(comic_pks, roles, exclude=False):
     return people.distinct().only("name")
 
 
-def get_contributors(comic_pks, roles, exclude=False):
+def get_contributors(comic_pks, roles, exclude):
     """Get credits that are not part of other roles."""
     contributors = Contributor.objects.filter(comic__in=comic_pks)
     if exclude:
@@ -59,8 +59,8 @@ def get_m2m_objects(pks) -> dict:
     for model in OPDS_M2M_MODELS:
         table = model.__name__.lower()
         rel = GroupACLMixin.get_rel_prefix(model)
-        comic_filter = {rel + "__in": pks}
-        qs = model.objects.filter(**comic_filter).order_by("name").only("name")
+        comic_filter = {rel + "in": pks}
+        qs = model.objects.filter(**comic_filter).only("name").order_by("name")
         cats[table] = qs
 
     return cats
@@ -78,7 +78,7 @@ def full_redirect_view(url_name):
         path = request.get_full_path()
         if path:
             parts = path.split("?")
-            if len(parts) >= 2:  # noqa PLR2004
+            if len(parts) >= 2:  # noqa: PLR2004
                 parts[0] = url
                 url = "?".join(parts)
 

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

@@ -47,8 +47,10 @@ class OPDS1Entry(OPDS1EntryLinksMixin):
                 elif group == "c":
                     title = Comic.get_title(
                         self.obj,
-                        zero_pad=self.zero_pad,
+                        volume=True,
+                        name=True,
                         filename_fallback=self.title_filename_fallback,
+                        zero_pad=self.zero_pad,
                     )
                     parts.append(title)
 
@@ -133,7 +135,7 @@ class OPDS1Entry(OPDS1EntryLinksMixin):
         """Get Author names."""
         if not self.metadata:
             return []
-        people = get_contributor_people(self.obj.ids, AUTHOR_ROLES)
+        people = get_contributor_people(self.obj.ids, AUTHOR_ROLES, exclude=False)
         return self._add_url_to_obj(people, "contributors")
 
     @property

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

@@ -20,7 +20,7 @@ class OPDS1EntryLinksMixin:
     """OPDS v1 Entry Links Methods."""
 
     def __init__(
-        self, obj, query_params, data: OPDS1EntryData, title_filename_fallback=False
+        self, obj, query_params, data: OPDS1EntryData, title_filename_fallback: bool
     ):
         """Initialize params."""
         self.obj = obj
@@ -35,7 +35,6 @@ class OPDS1EntryLinksMixin:
     def _cover_link(self, rel):
         if self.fake:
             return None
-        # 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))
@@ -46,12 +45,11 @@ class OPDS1EntryLinksMixin:
             }
             href = reverse("opds:bin:cover", kwargs=kwargs)
             href = update_href_query_params(href, query_params)
-            mime_type = "image/webp"
-            return OPDS1Link(rel, href, mime_type)
+            return OPDS1Link(rel, href, MimeType.WEBP)
         except Exception:
             LOG.exception("create thumb")
 
-    def _nav_href(self, metadata=False):
+    def _nav_href(self, metadata: bool):
         try:
             pks = sorted(self.obj.ids)
             kwargs = {"group": self.obj.group, "pks": pks, "page": 1}
@@ -73,7 +71,7 @@ class OPDS1EntryLinksMixin:
             LOG.exception(msg)
             raise
 
-    def _nav_link(self, metadata=False):
+    def _nav_link(self, metadata: bool):
         href = self._nav_href(metadata)
 
         group = self.obj.group
@@ -155,7 +153,7 @@ class OPDS1EntryLinksMixin:
 
             if self.obj.group == "c" and not self.fake:
                 result += self._links_comic()
-            elif nav := self._nav_link():
+            elif nav := self._nav_link(metadata=False):
                 result += [nav]
 
         except Exception:

codex/views/opds/v1/facets.py

@@ -169,11 +169,14 @@ class OPDS1FacetsView(BrowserView):
         )
         qps = {**self.request.GET}
         qps.update(query_params)
-        zero_pad: int = self.obj["zero_pad"]  # type: ignore
+        zero_pad: int = self.obj["zero_pad"]
         data = OPDS1EntryData(
-            self.opds_acquisition_groups, zero_pad, False, self.mime_type_map
+            self.opds_acquisition_groups,
+            zero_pad,
+            metadata=False,
+            mime_type_map=self.mime_type_map,
         )
-        return OPDS1Entry(entry_obj, qps, data)
+        return OPDS1Entry(entry_obj, qps, data, title_filename_fallback=False)
 
     def _is_facet_active(self, facet_group, facet):
         compare = [facet.value]
@@ -231,7 +234,8 @@ class OPDS1FacetsView(BrowserView):
                 facets += [facet_obj]
         return facets
 
-    def facets(self, entries=False, root=True):
+    def facets(self, entries: bool, root: bool):
+        # entries false, root true
         """Return facets."""
         facets = []
         group = self.kwargs.get("group")

codex/views/opds/v1/feed.py

@@ -75,7 +75,7 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
         """Create the feed title."""
         result = ""
         try:
-            browser_title: Mapping[str, Any] = self.obj.get("title")  # type: ignore
+            browser_title: Mapping[str, Any] = self.obj.get("title", {})
             if browser_title:
                 parent_name = browser_title.get("parent_name", "All")
                 pks = self.kwargs["pks"]
@@ -97,7 +97,7 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
         try:
             mtime = self.obj.get("mtime")
             if mtime:
-                datestr = mtime.isoformat()  # type: ignore
+                datestr = mtime.isoformat()
         except Exception:
             LOG.exception("Getting OPDS v1 updated")
         return datestr
@@ -124,13 +124,13 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
         """Get entries by key section."""
         entries = []
         if objs := self.obj.get(key):
-            zero_pad: int = self.obj["zero_pad"]  # type: ignore
+            zero_pad: int = self.obj["zero_pad"]
             data = OPDS1EntryData(
                 self.opds_acquisition_groups, zero_pad, metadata, self.mime_type_map
             )
             fallback = bool(self.admin_flags.get("folder_view"))
             import_pks = set()
-            for obj in objs:  # type: ignore
+            for obj in objs:
                 entry = OPDS1Entry(
                     obj,
                     self.request.GET,
@@ -157,7 +157,7 @@ class OPDS1FeedView(OPDS1LinksView, OPDSTemplateView):
                     entries += self.add_top_links(RootTopLinks.ALL)
                 entries += self.facets(entries=True, root=at_root)
 
-            entries += self._get_entries_section("groups", False)
+            entries += self._get_entries_section("groups", metadata=False)
             metadata = self.request.GET.get("opdsMetadata", "").lower() not in FALSY
             entries += self._get_entries_section("books", metadata)
         except Exception: