Update main.py

main.py

@@ -14,7 +14,7 @@ app = FastAPI()
 # ========== FB2 Generator ==========
 def html_to_fb2(title: str, body: str) -> str:
     clean_text = BeautifulSoup(body, "html.parser").get_text(separator="\n")
-    fb2 = f"""<?xml version='1.0' encoding='utf-8'?>
+    return f"""<?xml version='1.0' encoding='utf-8'?>
 <FictionBook xmlns:xlink='http://www.w3.org/1999/xlink'>
   <description>
     <title-info>
@@ -30,8 +30,7 @@ def html_to_fb2(title: str, body: str) -> str:
       <p>{clean_text}</p>
     </section>
   </body>
-</FictionBook>"""
-    return fb2
+</FictionBook>"""  
 
 # ========== DuckDuckGo Search ==========
 def duckduckgo_search(query: str):
@@ -53,114 +52,71 @@ def duckduckgo_search(query: str):
             break
     return results
 
-# ========== OPDS Feed Generators ==========
-def generate_root_feed():
+# ========== OPDS Feed Generator ==========
+def generate_feed(entries):
     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")
-
-    # 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"
-    ET.SubElement(entry_search, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
-    ET.SubElement(entry_search, "link", {
-        "rel": "subsection",
-        "href": "/opds/search",
-        "type": "application/atom+xml;profile=opds-catalog;kind=acquisition"
-    })
-
-    # 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"
-    ET.SubElement(entry_cached, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
-    ET.SubElement(entry_cached, "link", {
-        "rel": "subsection",
-        "href": "/opds/cached",
-        "type": "application/atom+xml;profile=opds-catalog;kind=navigation"
-    })
-
-    return ET.tostring(feed, encoding="utf-8", xml_declaration=True)
-
-
-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:
+    for entry_info in entries:
         entry = ET.SubElement(feed, "entry")
-        ET.SubElement(entry, "id").text = url
-        ET.SubElement(entry, "title").text = title
-        ET.SubElement(entry, "updated").text = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
-        ET.SubElement(entry, "link", {
-            "rel": "http://opds-spec.org/acquisition",
-            "href": f"/download?url={quote(url, safe='')}",
-            "type": "application/fb2+xml"
-        })
+        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 opds_root() -> Response:
-    xml_data = generate_root_feed()
-    return Response(
-        content=xml_data,
-        media_type="application/atom+xml;profile=opds-catalog;kind=navigation"
-    )
-
-@app.get("/opds/search")
-def opds_search(
-    q: Optional[str] = Query(None, description="Search query"),
-    searchType: Optional[str] = Query(None, alias="searchType")
-) -> Response:
-    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_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"
-    )
+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:
+    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'
+        }
+    })
+    if q:
+        results = duckduckgo_search(q)
+        for title, url in results:
+            entries.append({
+                'id': url,
+                'title': title,
+                'updated': datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ"),
+                'link': {
+                    'rel': 'http://opds-spec.org/acquisition',
+                    'href': f"/download?url={quote(url, safe='')}",
+                    'type': 'application/fb2+xml'
+                }
+            })
+    xml_data = generate_feed(entries)
+    kind = 'acquisition' if q else 'search'
+    return Response(content=xml_data,
+                    media_type=f"application/atom+xml;profile=opds-catalog;kind={kind}")
 
 @app.get("/download")
 def download_fb2(url: str) -> Response:
@@ -168,8 +124,7 @@ def download_fb2(url: str) -> Response:
     res.raise_for_status()
     soup = BeautifulSoup(res.text, "html.parser")
     title = soup.title.string.strip() if soup.title and soup.title.string else "article"
-    body = str(soup.body)
-    fb2 = html_to_fb2(title, body)
+    fb2 = html_to_fb2(title, str(soup.body))
     filename = f"{quote(title, safe='').replace('%20','_')[:30]}.fb2"
     return Response(
         content=fb2,