Update main.py

main.py

@@ -7,6 +7,7 @@ from bs4 import BeautifulSoup
 from urllib.parse import quote
 import xml.etree.ElementTree as ET
 from datetime import datetime
+from typing import Optional
 
 app = FastAPI()
 
@@ -53,7 +54,6 @@ def duckduckgo_search(query: str):
     return results
 
 # ========== OPDS Feed Generators ==========
-
 def generate_root_feed():
     ns = "http://www.w3.org/2005/Atom"
     ET.register_namespace("", ns)
@@ -62,7 +62,7 @@ def generate_root_feed():
     ET.SubElement(feed, "title").text = "DuckDuckGo OPDS Catalog"
     ET.SubElement(feed, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
 
-    # Entry for search subsection
+    # Entry: Search Section
     entry_search = ET.SubElement(feed, "entry")
     ET.SubElement(entry_search, "id").text = "urn:uuid:duckopds-search-section"
     ET.SubElement(entry_search, "title").text = "Search"
@@ -73,7 +73,7 @@ def generate_root_feed():
         "type": "application/atom+xml;profile=opds-catalog;kind=acquisition"
     })
 
-    # Entry for cached subsection (placeholder)
+    # Entry: Cached Section
     entry_cached = ET.SubElement(feed, "entry")
     ET.SubElement(entry_cached, "id").text = "urn:uuid:duckopds-cached-section"
     ET.SubElement(entry_cached, "title").text = "Cached"
@@ -87,14 +87,30 @@ def generate_root_feed():
     return ET.tostring(feed, encoding="utf-8", xml_declaration=True)
 
 
-def generate_search_feed(query: str, results):
+def generate_search_form_feed():
+    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-search-form"
+    ET.SubElement(feed, "title").text = "Search"
+    ET.SubElement(feed, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
+    # Templated search link
+    feed.append(ET.Element("link", {
+        "rel": "search",
+        "type": "application/atom+xml;profile=opds-catalog;kind=acquisition",
+        "href": "/opds/search?q={searchTerms}",
+        "templated": "true"
+    }))
+    return ET.tostring(feed, encoding="utf-8", xml_declaration=True)
+
+
+def generate_search_results_feed(query: str, results):
     ns = "http://www.w3.org/2005/Atom"
     ET.register_namespace("", ns)
     feed = ET.Element("feed", xmlns=ns)
     ET.SubElement(feed, "id").text = f"urn:uuid:duckopds-search-{quote(query)}"
     ET.SubElement(feed, "title").text = f"Search results for '{query}'"
     ET.SubElement(feed, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
-
     for title, url in results:
         entry = ET.SubElement(feed, "entry")
         ET.SubElement(entry, "id").text = url
@@ -108,7 +124,6 @@ def generate_search_feed(query: str, results):
     return ET.tostring(feed, encoding="utf-8", xml_declaration=True)
 
 # ========== Routes ==========
-
 @app.get("/opds", include_in_schema=False)
 def opds_root() -> Response:
     xml_data = generate_root_feed()
@@ -119,17 +134,34 @@ def opds_root() -> Response:
 
 @app.get("/opds/search")
 def opds_search(
-    q: str = Query(..., description="Search query"),
-    searchType: str = Query(None, alias="searchType")
+    q: Optional[str] = Query(None, description="Search query"),
+    searchType: Optional[str] = Query(None, alias="searchType")
 ) -> Response:
-    # Ignore searchType parameter
+    if not q:
+        xml_data = generate_search_form_feed()
+        return Response(content=xml_data,
+                        media_type="application/atom+xml;profile=opds-catalog;kind=search")
+    # perform actual search for q
     results = duckduckgo_search(q)
-    xml_data = generate_search_feed(q, results)
+    xml_data = generate_search_results_feed(q, results)
     return Response(
         content=xml_data,
         media_type="application/atom+xml;profile=opds-catalog;kind=acquisition"
     )
 
+@app.get("/opds/cached")
+def opds_cached() -> Response:
+    # placeholder empty feed
+    feed = ET.Element("feed", xmlns="http://www.w3.org/2005/Atom")
+    ET.SubElement(feed, "id").text = "urn:uuid:duckopds-cached"
+    ET.SubElement(feed, "title").text = "Cached Items"
+    ET.SubElement(feed, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
+    xml_data = ET.tostring(feed, encoding="utf-8", xml_declaration=True)
+    return Response(
+        content=xml_data,
+        media_type="application/atom+xml;profile=opds-catalog;kind=navigation"
+    )
+
 @app.get("/download")
 def download_fb2(url: str) -> Response:
     res = requests.get(url, headers={"User-Agent": "Mozilla/5.0"}, timeout=10)