codex 1.7.0__py3-none-any.whl → 1.7.0a0__py3-none-any.whl

codex/views/session.py

@@ -4,63 +4,77 @@ from abc import ABC
 from copy import deepcopy
 from types import MappingProxyType
 
-from codex.choices import BROWSER_DEFAULTS, READER_DEFAULTS, mapping_to_dict
 from codex.logger.logging import get_logger
+from codex.serializers.choices import DEFAULTS
 from codex.views.auth import AuthFilterGenericAPIView
 from codex.views.util import pop_name
 
 LOG = get_logger(__name__)
 
-CONTRIBUTOR_PERSON_UI_FIELD = "contributors"
-STORY_ARC_UI_FIELD = "story_arcs"
-IDENTIFIER_TYPE_UI_FIELD = "identifier_type"
-
-_DYNAMIC_FILTER_DEFAULTS = MappingProxyType(
-    {
-        "age_rating": [],
-        "characters": [],
-        "country": [],
-        CONTRIBUTOR_PERSON_UI_FIELD: [],
-        "community_rating": [],
-        "critical_rating": [],
-        "decade": [],
-        "file_type": [],
-        "genres": [],
-        IDENTIFIER_TYPE_UI_FIELD: [],
-        "language": [],
-        "locations": [],
-        "monochrome": [],
-        "original_format": [],
-        "reading_direction": [],
-        "series_groups": [],
-        "stories": [],
-        STORY_ARC_UI_FIELD: [],
-        "tagger": [],
-        "tags": [],
-        "teams": [],
-        "year": [],
-    }
-)
-
 
 class SessionView(AuthFilterGenericAPIView, ABC):
     """Generic Session View."""
 
-    # Must override this
+    # Must override both of these
     SESSION_KEY = ""
+
+    CONTRIBUTOR_PERSON_UI_FIELD = "contributors"
+    STORY_ARC_UI_FIELD = "story_arcs"
+    IDENTIFIER_TYPE_UI_FIELD = "identifier_type"
+    _DYNAMIC_FILTER_DEFAULTS = MappingProxyType(
+        {
+            "age_rating": [],
+            "characters": [],
+            "country": [],
+            CONTRIBUTOR_PERSON_UI_FIELD: [],
+            "community_rating": [],
+            "critical_rating": [],
+            "decade": [],
+            "file_type": [],
+            "genres": [],
+            IDENTIFIER_TYPE_UI_FIELD: [],
+            "language": [],
+            "locations": [],
+            "monochrome": [],
+            "original_format": [],
+            "reading_direction": [],
+            "series_groups": [],
+            "stories": [],
+            STORY_ARC_UI_FIELD: [],
+            "tagger": [],
+            "tags": [],
+            "teams": [],
+            "year": [],
+        }
+    )
     FILTER_ATTRIBUTES = frozenset(_DYNAMIC_FILTER_DEFAULTS.keys())
     BROWSER_SESSION_KEY = "browser"
     READER_SESSION_KEY = "reader"
     SESSION_DEFAULTS = MappingProxyType(
         {
             BROWSER_SESSION_KEY: {
-                **BROWSER_DEFAULTS,
+                "breadcrumbs": DEFAULTS["breadcrumbs"],
                 "filters": {
-                    "bookmark": BROWSER_DEFAULTS["bookmark_filter"],
+                    "bookmark": DEFAULTS["bookmarkFilter"],
                     **_DYNAMIC_FILTER_DEFAULTS,
                 },
+                "order_by": DEFAULTS["orderBy"],
+                "order_reverse": DEFAULTS["orderReverse"],
+                "q": DEFAULTS["q"],
+                "search_results_limit": DEFAULTS["searchResultsLimit"],
+                "show": DEFAULTS["show"],
+                "dynamic_covers": DEFAULTS["dynamicCovers"],
+                "custom_covers": DEFAULTS["customCovers"],
+                "twenty_four_hour_time": DEFAULTS["twentyFourHourTime"],
+                "top_group": DEFAULTS["topGroup"],
+            },
+            READER_SESSION_KEY: {
+                "finish_on_last_page": DEFAULTS["finishOnLastPage"],
+                "fit_to": DEFAULTS["fitTo"],
+                "two_pages": DEFAULTS["twoPages"],
+                "read_rtl_in_reverse": DEFAULTS["readRtlInReverse"],
+                "reading_direction": DEFAULTS["readingDirection"],
             },
-            READER_SESSION_KEY: READER_DEFAULTS,
         }
     )
 
@@ -83,8 +97,7 @@ class SessionView(AuthFilterGenericAPIView, ABC):
             "breadcrumbs", session_key=self.BROWSER_SESSION_KEY
         )
         if not breadcrumbs:
-            default_breadcrumbs: tuple[dict] = BROWSER_DEFAULTS["breadcrumbs"]  # type: ignore
-            breadcrumbs = default_breadcrumbs
+            breadcrumbs = DEFAULTS["breadcrumbs"]
         last_route = breadcrumbs[-1]
         if not name:
             last_route = pop_name(last_route)
@@ -114,11 +127,9 @@ class SessionView(AuthFilterGenericAPIView, ABC):
             defaults = {}
             for key in only:
                 if key:
-                    defaults[key] = mapping_to_dict(
-                        self.SESSION_DEFAULTS[session_key][key]
-                    )
+                    defaults[key] = self.SESSION_DEFAULTS[session_key][key]
         else:
-            defaults = mapping_to_dict(self.SESSION_DEFAULTS[session_key])
+            defaults = self.SESSION_DEFAULTS[session_key]
 
         session = self.request.session.get(session_key, defaults)
         return self._get_source_values_or_set_defaults(defaults, session, {})
@@ -128,7 +139,7 @@ class SessionView(AuthFilterGenericAPIView, ABC):
         try:
             # Deepcopy this so serializing the values later later for http response doesn't alter them
             params = deepcopy(dict(params))
-            defaults = mapping_to_dict(self.SESSION_DEFAULTS[self.SESSION_KEY])
+            defaults = self.SESSION_DEFAULTS[self.SESSION_KEY]
             data = self._get_source_values_or_set_defaults(defaults, params, {})
             self.request.session[self.SESSION_KEY] = data
             self.request.session.save()

codex/views/version.py

@@ -15,7 +15,7 @@ class VersionView(AuthGenericAPIView):
 
     serializer_class = VersionsSerializer
 
-    def get_object(self) -> dict[str, str]:  # type: ignore
+    def get_object(self):
         """Get the versions."""
         ts = Timestamp.objects.get(key=Timestamp.TimestampChoices.CODEX_VERSION.value)
         if ts.version:

{codex-1.7.0.dist-info → codex-1.7.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codex
-Version: 1.7.0
+Version: 1.7.0a0
 Summary: A comic archive web server.
 Home-page: https://github.com/ajslater/codex
 License: GPL-3.0-only
@@ -338,7 +338,10 @@ index, a Django cache and comic book cover thumbnails.
   when codex starts.
 - `CODEX_FIX_FOREIGN_KEYS=1` will check for and try to repair illegal foreign
   keys on startup.
-- `CODEX_INTEGRITY_CHECK=1` will perform database integrity check on startup.
+- `CODEX_INTEGRITY_CHECK=1` will perform a quick full database integrity check
+  on startup.
+- `CODEX_INTEGRITY_CHECK=full` will perform a more thorough database integrity
+  check on startup.
 - `CODEX_FTS_INTEGRITY_CHECK=1` will perform an integrity check on the full text
   search index.
 - `CODEX_FTS_REBUILD=1` will rebuild the full text search index.