Update main.py

main.py

@@ -30,7 +30,7 @@ def html_to_fb2(title: str, body: str) -> str:
       <p>{clean_text}</p>
     </section>
   </body>
-</FictionBook>"""  
+</FictionBook>"""
 
 # ========== DuckDuckGo Search ==========
 def duckduckgo_search(query: str):
@@ -52,54 +52,39 @@ def duckduckgo_search(query: str):
             break
     return results
 
-# ========== OPDS Feed Generator ==========
-def generate_feed(entries):
+# ========== OPDS Feed Generation ==========
+def create_feed(entries: list, templated: bool, q: Optional[str]) -> bytes:
     ns = "http://www.w3.org/2005/Atom"
     ET.register_namespace("", ns)
     feed = ET.Element("feed", xmlns=ns)
     ET.SubElement(feed, "id").text = "urn:uuid:duckopds-catalog"
     ET.SubElement(feed, "title").text = "DuckDuckGo OPDS Catalog"
     ET.SubElement(feed, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    # OpenSearch templated search link
+    link_attrs = {
+        "rel": "search",
+        "type": "application/atom+xml;profile=opds-catalog;kind=search",
+        "href": "/opds?q={searchTerms}",
+        "templated": "true"
+    }
+    ET.SubElement(feed, "link", link_attrs)
+
+    # Add entries for search results
     for entry_info in entries:
         entry = ET.SubElement(feed, "entry")
         ET.SubElement(entry, "id").text = entry_info['id']
         ET.SubElement(entry, "title").text = entry_info['title']
         ET.SubElement(entry, "updated").text = entry_info['updated']
         ET.SubElement(entry, "link", entry_info['link'])
+
     return ET.tostring(feed, encoding="utf-8", xml_declaration=True)
 
 # ========== Routes ==========
 @app.get("/opds", include_in_schema=False)
-def root_opds() -> Response:
-    # Only search section
-    entries = [{
-        'id': 'urn:uuid:duckopds-search-section',
-        'title': 'Search',
-        'updated': datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
-        'link': {
-            'rel': 'subsection',
-            'href': '/opds',  # self endpoint handles search form if no q
-            'type': 'application/atom+xml;profile=opds-catalog;kind=search'
-        }
-    }]
-    xml_data = generate_feed(entries)
-    return Response(content=xml_data,
-                    media_type="application/atom+xml;profile=opds-catalog;kind=navigation")
-
-@app.get("/opds")
-def opds_search(q: Optional[str] = Query(None, description="Search query")) -> Response:
+def opds(q: Optional[str] = Query(None, alias="q", description="Search query")) -> Response:
     entries = []
-    # Always include search entry at top
-    entries.append({
-        'id': 'urn:uuid:duckopds-search-section',
-        'title': 'Search',
-        'updated': datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
-        'link': {
-            'rel': 'subsection',
-            'href': '/opds',
-            'type': 'application/atom+xml;profile=opds-catalog;kind=search'
-        }
-    })
+    kind = "search"
     if q:
         results = duckduckgo_search(q)
         for title, url in results:
@@ -113,8 +98,8 @@ def opds_search(q: Optional[str] = Query(None, description="Search query")) -> R
                     'type': 'application/fb2+xml'
                 }
             })
-    xml_data = generate_feed(entries)
-    kind = 'acquisition' if q else 'search'
+        kind = "acquisition"
+    xml_data = create_feed(entries, templated=True, q=q)
     return Response(content=xml_data,
                     media_type=f"application/atom+xml;profile=opds-catalog;kind={kind}")