ajslater
diff --git a/‎NEWS.md‎
Lines changed: 9 additions & 2 deletions b/‎NEWS.md‎
Lines changed: 9 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎codex/serializers/opds_v1.py‎
Lines changed: 0 additions & 1 deletion b/‎codex/serializers/opds_v1.py‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎codex/templates/index.html‎
Lines changed: 1 addition & 1 deletion b/‎codex/templates/index.html‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎codex/views/opds_v1/browser.py‎
Lines changed: 143 additions & 8 deletions b/‎codex/views/opds_v1/browser.py‎
Lines changed: 143 additions & 8 deletions
@@ -1,8 +1,15 @@
 # 📰 Codex News
 
+## v0.12.2
+
+- Fixes
+
+  - Fix OPDS downloading & streaming for Chunky Comic Reader.
+  - Hack in facets as nav links for Panels & Chunky OPDS readers.
+
 ## v0.12.1
 
-- Fix
+- Fixes
 
   - Disable article ignore on name sort in folder view.
   - Fix browser navigation bug with issues top group.
@@ -19,7 +26,7 @@ _Syndication_
   - Larger browser covers.
   - Sort by name ignores leading articles in 11 languages.
 
-- Fix
+- Fixes
 
   - Use defusexml to load xml metadata for safety.
   - Removed process naming. My implementation was prone to instability.
 
@@ -265,7 +265,7 @@ You may find the OPDS url in the side drawer. It should take the form:
 
 #### Clients
 
-- iOS has [Panels](https://panels.app/) and [KYBook 3](http://kybook-reader.com/)
+- iOS has [Panels](https://panels.app/), [KYBook 3](http://kybook-reader.com/), and [Chunky Comic Reader](https://apps.apple.com/us/app/chunky-comic-reader/id663567628)
 - Android has [Moon+](https://play.google.com/store/apps/details?id=com.flyersoft.moonreader) and [Librera](https://play.google.com/store/apps/details?id=com.foobnix.pdf.reader)
 
 #### HTTP Basic Authentication
 
@@ -20,7 +20,6 @@
 )
 
 
-# LOOK AT BROWSERCARD
 class OPDSEntrySerializer(BrowserCardOPDSBaseSerializer):
     """Browse card displayed in the browser."""
 
 
@@ -14,7 +14,7 @@
             API_V2_PATH: "{% url 'api_v2:base' %}",
             LAST_ROUTE: {{ last_route | safe }},
             MISSING_COVER: "{% static 'img/missing-cover.webp' %}",
-            OPDS_PATH: "{% url 'opds:v1:browser' 'r' 0 1 %}"
+            OPDS_PATH: "{% url 'opds:start' %}"
           };
           Object.freeze(CODEX);
         </script>
 
@@ -2,6 +2,7 @@
 import math
 
 from decimal import Decimal
+from urllib.parse import urlencode
 
 from django.contrib.syndication.views import Feed
 from django.core.handlers.wsgi import WSGIRequest
@@ -62,22 +63,49 @@ class BrowserFeed(BrowserView, Feed, OPDSAuthenticationMixin):
     FOLDER_VIEW_KWARGS = {"group": "f", "pk": 0, "page": 1}
     BLANK_TITLE = "Unknown"
 
+    class UserAgents:
+        """Control whether to hack in facets with nav links."""
+
+        NO_FACET_SUPPORT = ("Panels", "Chunky")
+        CLIENT_REORDERS = ("Chunky",)
+        # FACET_SUPPORT = ("yar",) # kybooks 3
+
+    ORDER_GLYPH = "↓"
+    TOP_GROUP_GLYPH = "⊙"
+
+    def _init(self, request, kwargs):
+        """Initialize a bit like the api browser."""
+        self.request: WSGIRequest = request
+        self.kwargs = kwargs
+        self._parse_params()
+
+        # Hacks for clients that don't support facets
+        user_agent = request.headers.get("User-Agent")
+        self.use_facets = True
+        self.skip_order_facet_hacks = False
+        for prefix in self.UserAgents.NO_FACET_SUPPORT:
+            if user_agent.startswith(prefix):
+                self.use_facets = False
+                break
+        for prefix in self.UserAgents.CLIENT_REORDERS:
+            if user_agent.startswith(prefix):
+                self.skip_order_facet_hacks = True
+                break
+
     def __call__(self, request, *args, **kwargs):
         """Check permissions, use call() instead of get()."""
         response = self._authenticate(request)
         if response:
             return response
 
         try:
+            self._init(request, kwargs)
             return super().__call__(request, *args, **kwargs)
         except SeeOtherRedirectError as exc:
             return exc.get_response("opds:v1:browser")
 
     def get_object(self, request, *args, **kwargs):
         """Get the main feed object from BrowserView."""
-        self.request: WSGIRequest = request
-        self.kwargs = kwargs
-        self._parse_params()
         browser_page = self._get_browser_page()
         serializer = OPDSFeedSerializer(browser_page)
         self.obj = serializer.data
@@ -115,17 +143,106 @@ def feed_guid(self):
 
     def feed_extra_kwargs(self, obj):
         """Extra kwargs for the feed."""
+        is_aq_feed = obj and obj.get("model_group") == "c"
         extra_kwargs = {
             "feed_obj": obj,
             "kwargs": self.kwargs,
             "query_params": self.request.GET.dict(),
             "self_link": self.link(),
+            "is_aquisition_feed": is_aq_feed,
+            "use_facets": self.use_facets,
         }
         return extra_kwargs
 
+    def _get_facet_nav_hack_item(self, query_params, title, reverse_kwargs, glyph):
+        group = self.kwargs.get("group")
+        pk = self.kwargs.get("pk")
+        href = reverse("opds:v1:browser", kwargs=reverse_kwargs)
+        return {
+            "href": href,
+            "name": " ".join((glyph, title)),
+            "group": group,
+            "pk": pk,
+            "query_params": query_params,
+        }
+
+    def _get_facet_nav_hack_items(self):
+        group = self.kwargs.get("group")
+        order_by = self.request.GET.get("order_by")
+        top_group = self.request.GET.get("top_group", "p")
+        item_params = []
+        if not self.skip_order_facet_hacks:
+            if order_by != "date":
+                item_params.append(
+                    (
+                        {"order_by": "date"},
+                        "Order by Publication Date",
+                        self.kwargs,
+                        self.ORDER_GLYPH,
+                    )
+                )
+            if order_by not in (None, "sort_name"):
+                item_params.append(
+                    (
+                        {"order_by": "sort_name"},
+                        "Order by Name",
+                        self.kwargs,
+                        self.ORDER_GLYPH,
+                    )
+                )
+            if order_by != "search_score":
+                item_params.append(
+                    (
+                        {"order_by": "search_score"},
+                        "Order by Search Score",
+                        self.kwargs,
+                        self.ORDER_GLYPH,
+                    )
+                )
+
+        browser_view_kwargs = {**self.kwargs}
+        if group == "f":
+            browser_view_kwargs["group"] = "r"
+        if top_group != "p":
+            item_params.append(
+                (
+                    {"top_group": "p"},
+                    "Publishers View",
+                    browser_view_kwargs,
+                    self.TOP_GROUP_GLYPH,
+                )
+            )
+        if top_group != "s":
+            item_params.append(
+                (
+                    {"top_group": "s"},
+                    "Series View",
+                    browser_view_kwargs,
+                    self.TOP_GROUP_GLYPH,
+                )
+            )
+        if group != "f":
+            item_params.append(
+                (
+                    {"top_group": "f"},
+                    "Folder View",
+                    browser_view_kwargs,
+                    self.TOP_GROUP_GLYPH,
+                )
+            )
+
+        items = []
+        for params in item_params:
+            items += [self._get_facet_nav_hack_item(*params)]
+        return items
+
     def items(self, obj):
         """Return items from the obj."""
-        return obj.get("obj_list")
+        items = obj.get("obj_list")
+        if not self.use_facets:
+            facet_items = self._get_facet_nav_hack_items()
+            items = (*facet_items, *items)
+        return items
 
     def item_link(self):
         """Link is handled by item_extra_kwargs to change its rel."""
@@ -181,18 +298,36 @@ def item_description(self, item: dict):
         # So take it's value and use it in the feed generator.
         if item.get("group") == "c":
             desc = item.get("summary")
-        else:
-            children = item.get("child_count", "No")
+        elif children := item.get("child_count"):
             desc = f"{children} items."
+        else:
+            desc = None
 
         return desc
 
     def item_guid(self, item):
         """GUID is a nav url."""
+        if item.get("rel") == "alternate":
+            href = item.get("href")
+            if qp := item.get("query_params"):
+                href += "?" + urlencode(qp)
+            return href
+
         group = item.get("group")
         pk = item.get("pk")
-        return reverse("opds:v1:browser", kwargs={"group": group, "pk": pk, "page": 0})
+        return reverse("opds:v1:browser", kwargs={"group": group, "pk": pk, "page": 1})
 
     def item_extra_kwargs(self, item: dict):
         """Send entry serialization to feedgenerator."""
-        return {"card": item, "summary": self.item_description(item)}
+        group = item.get("group")
+        try:
+            group_index = self.valid_nav_groups.index(group)
+            aq_link = group_index + 1 >= len(self.valid_nav_groups)
+        except (ValueError, IndexError):
+            aq_link = False
+
+        return {
+            "card": item,
+            "summary": self.item_description(item),
+            "aq_link": aq_link,
+        }
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`)`
`21`	`21`
`22`	`22`
`23`		`-# LOOK AT BROWSERCARD`
`24`	`23`	`class OPDSEntrySerializer(BrowserCardOPDSBaseSerializer):`
`25`	`24`	`"""Browse card displayed in the browser."""`
`26`	`25`