api 有变化， v2 to v3

ocr/getdata.py

@@ -16,11 +16,11 @@ from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
 TARGET_PATTERNS = {
-    "paragraphs": re.compile(r"/api/ancientlib/read/book/paragraphs/v2(?:\?|$)"),
-    "pages": re.compile(r"/api/ancientlib/read/book/pages/v3/(?:\?|$)"),
-    "word_box": re.compile(r"/api/ancientlib/read/word-box-page-content/m-get/(?:\?|$)"),
-    "loader": re.compile(r"__loader=__session"),
-    "volume": re.compile(r"/api/ancientlib/read/get/volume/(?:\?|$)"),
+    "paragraphs": re.compile(r"/api/ancientlib/read/book/paragraphs/v\d+(?:/)?(?:\?|$)"),
+    "pages": re.compile(r"/api/ancientlib/read/book/pages/v\d+(?:/)?(?:\?|$)"),
+    "word_box": re.compile(r"/api/ancientlib/read/word-box-page-content/m-get(?:/)?(?:\?|$)"),
+    "loader": re.compile(r"(?:\?|&)__loader=__[^&]+"),
+    "volume": re.compile(r"/api/ancientlib/read/get/volume(?:/)?(?:\?|$)"),
 }
 
 IMAGE_URL_RE = re.compile(r"https?://[^ ]+(?:\.webp|\.image|\.png|\.jpe?g|\.bmp)(?:\?.*)?$", re.IGNORECASE)
@@ -217,8 +217,10 @@ def _drain_network(
                     kind = k
                     break
             if not kind:
-                continue
-            request_id = params.get("requestId")
+                if request_id and "/api/ancientlib/read/" in url and ("json" in mime_type.lower() or mime_type.startswith("text/")):
+                    kind = "unknown_read_api"
+                else:
+                    continue
             if not request_id:
                 continue
             status = int(response.get("status", 0) or 0)
@@ -235,6 +237,8 @@ def _drain_network(
                     print(f"[DEBUG] Failed to get response body for image {url}: {e}")
                 continue
             if kind == "image":
+                if max_images == 0:
+                    continue
                 if max_images > 0 and len(img_saved) >= max_images:
                     print(f"[DEBUG] Max images reached, skipping {url}")
                     continue
@@ -299,6 +303,39 @@ def _drain_network(
                     body_text = base64.b64decode(body_text).decode("utf-8", errors="replace")
                 except Exception:
                     body_text = ""
+
+            if kind == "unknown_read_api":
+                payload = _json_loads_maybe(body_text)
+                if isinstance(payload, dict):
+                    if isinstance(payload.get("paragraphList"), list):
+                        para_payload = {
+                            "errorCode": 0,
+                            "errorMsg": "",
+                            "data": {"paragraphs": payload["paragraphList"]},
+                        }
+                        body_text = json.dumps(para_payload, ensure_ascii=False)
+                        kind = "paragraphs"
+                        print(f"[DEBUG] Reclassified unknown_read_api as paragraphs via paragraphList")
+                    elif isinstance(payload.get("data"), dict):
+                        data = payload["data"]
+                        if isinstance(data.get("paragraphList"), list):
+                            para_payload = {
+                                "errorCode": 0,
+                                "errorMsg": "",
+                                "data": {"paragraphs": data["paragraphList"]},
+                            }
+                            body_text = json.dumps(para_payload, ensure_ascii=False)
+                            kind = "paragraphs"
+                            print(f"[DEBUG] Reclassified unknown_read_api as paragraphs via data.paragraphList")
+                        elif isinstance(data.get("paragraphs"), list):
+                            kind = "paragraphs"
+                            print(f"[DEBUG] Reclassified unknown_read_api as paragraphs via data.paragraphs")
+                        elif isinstance(data.get("pages"), list):
+                            kind = "pages"
+                            print(f"[DEBUG] Reclassified unknown_read_api as pages via data.pages")
+                        elif isinstance(data.get("pageId2WordBoxContent"), dict):
+                            kind = "word_box"
+                            print(f"[DEBUG] Reclassified unknown_read_api as word_box via data.pageId2WordBoxContent")
                     
             if kind == "loader":
                 try:
@@ -313,7 +350,7 @@ def _drain_network(
                         }
                         body_text = json.dumps(para_payload, ensure_ascii=False)
                         kind = "paragraphs"
-                        url = "https://www.shidianguji.com/api/ancientlib/read/book/paragraphs/v2?mock=from_loader"
+                        url = "https://www.shidianguji.com/api/ancientlib/read/book/paragraphs/v3?mock=from_loader"
                         print(f"[DEBUG] Transformed loader response to paragraphs format")
                 except Exception as e:
                     print(f"[DEBUG] Failed to parse loader JSON: {e}")
@@ -858,4 +895,3 @@ def main() -> int:
 
 if __name__ == "__main__":
     raise SystemExit(main())
-