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

codex/views/settings.py

@@ -5,30 +5,43 @@ from abc import ABC
 from drf_spectacular.utils import extend_schema
 from rest_framework.response import Response
 
+from codex.serializers.settings import SettingsSerializer
 from codex.views.session import SessionView
+from codex.views.util import reparse_json_query_params
+
+_GET_JSON_PARAMS = frozenset({"only"})
 
 
 class SettingsView(SessionView, ABC):
     """Settings View."""
 
+    input_serializer_class = SettingsSerializer
+
+    def validate_settings_get(self, _validated_data, params: dict) -> dict:
+        """Change bad settings."""
+        return params
+
+    @extend_schema(parameters=[SettingsSerializer])
     def get(self, *args, **kwargs):
         """Get session settings."""
-        defaults = self.SESSION_DEFAULTS[self.SESSION_KEY]
-        session = self.request.session.get(self.SESSION_KEY, defaults)
-        params = self._get_source_values_or_set_defaults(defaults, session, {})
-        data = {}
-        for key, filter_name in params.get("filters", {}).items():
-            if filter_name:
-                data[key] = filter_name
-        params["filters"] = data
+        data = self.request.GET
+        data = reparse_json_query_params(data, _GET_JSON_PARAMS)
+        serializer = self.input_serializer_class(data=data)
+        serializer.is_valid(raise_exception=True)
+        validated_data = serializer.validated_data
+        only = validated_data.get("only") if validated_data else None  # type: ignore
+        params = self.load_params_from_session(only=only)
+        params = self.validate_settings_get(validated_data, params)
         serializer = self.get_serializer(params)
         return Response(serializer.data)
 
     @extend_schema(responses=None)
-    def put(self, *args, **kwargs):
+    def patch(self, *args, **kwargs):
         """Update session settings."""
         data = self.request.data  # type: ignore
         serializer = self.get_serializer(data=data)
         serializer.is_valid(raise_exception=True)
-        self.save_params_to_session(serializer.validated_data)
+        params = self.load_params_from_session()
+        params.update(serializer.validated_data)
+        self.save_params_to_session(params)
         return Response()

codex/views/util.py

@@ -26,6 +26,7 @@ class Route(dict):
             bool(cmp is not None)
             and (self.group == cmp.group)
             and (set(self.pks) == set(cmp.pks))
+            and (self.page == cmp.page)
         )
 
     def __and__(self, cmp):
@@ -33,7 +34,7 @@ class Route(dict):
         return (
             bool(cmp is not None)
             and (self.group == cmp.group)
-            and (set(self.pks) & set(cmp.pks))
+            and (self.pks == cmp.pks or (set(self.pks) & set(cmp.pks)))
         )
 
     dict = asdict

codex/websockets/consumers.py

@@ -14,24 +14,28 @@ LOG = get_logger(__name__)
 class NotifierConsumer(AsyncWebsocketConsumer):
     """Base Notifier Consumer."""
 
-    @staticmethod
-    def _get_groups(user):
+    def _get_groups(self):
         """Dynamic groups by user type."""
         groups = [ChannelGroups.ALL.name]
-        if user.is_staff:
+        user = self.scope.get("user") if self.scope else None
+        user_channel = None
+        if user:
+            user_channel = f"user_{user.id}"
+        else:
+            session = self.scope.get("session")
+            if session:
+                user_channel = f"user_{session.session_key}"
+        if user_channel:
+            groups += [user_channel]
+        if user and user.is_staff:
             groups += [ChannelGroups.ADMIN.name]
         return groups
 
     async def websocket_connect(self, message):
         """Authorize with user and connect websocket to groups."""
         # Authorization
-        user = self.scope.get("user") if self.scope else None
-        if not user:
-            LOG.warning("Websockets not available for unregistered users.")
-            return
-
         # Set groups for user.
-        self.groups = self._get_groups(user)
+        self.groups = self._get_groups()
 
         await super().websocket_connect(message)
         LOG.debug(f"Websocket connected to {self.groups}")

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

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