Ensured */* Accept headers always match for OPDS1

Allow /groups to also be OPDS2 if requested
ThePalaceProject · Sep 14, 2023 · bef06fe · bef06fe
1 parent e3ecb1c
commit bef06fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/api/controller.py b/api/controller.py
@@ -912,7 +912,7 @@ def groups(self, lane_identifier, feed_class=OPDSAcquisitionFeed):
             annotator=annotator,
             facets=facets,
             search_engine=search_engine,
-        ).as_response()
+        ).as_response(mime_types=flask.request.accept_mimetypes)
 
     def feed(self, lane_identifier, feed_class=OPDSAcquisitionFeed):
         """Build or retrieve a paginated acquisition feed.

diff --git a/core/feed/opds.py b/core/feed/opds.py
@@ -17,11 +17,10 @@
 def get_serializer(
     mime_types: Optional[MIMEAccept],
 ) -> SerializerInterface[Any]:
-    # Loop through and return whichever mimetype is encountered first
-    # Sort values by q-value first
+    # Ordering matters for poor matches (eg. */*), so we will keep OPDS1 first
     serializers: Dict[str, Type[SerializerInterface[Any]]] = {
-        "application/opds+json": OPDS2Serializer,
         "application/atom+xml": OPDS1Serializer,
+        "application/opds+json": OPDS2Serializer,
     }
     if mime_types:
         match = mime_types.best_match(