fix 下载第二十五章
Browse files- ocr/getdata.py +11 -6
ocr/getdata.py
CHANGED
|
@@ -375,7 +375,7 @@ def _enter_image_mode(driver: webdriver.Chrome) -> None:
|
|
| 375 |
def main() -> int:
|
| 376 |
ap = argparse.ArgumentParser()
|
| 377 |
ap.add_argument("--book-id", default="SWX0005")
|
| 378 |
-
ap.add_argument("--chapter", default="第二十
|
| 379 |
ap.add_argument("--out", default="out")
|
| 380 |
ap.add_argument("--headless", action="store_true")
|
| 381 |
ap.add_argument("--timeout", type=int, default=20000)
|
|
@@ -418,6 +418,7 @@ def main() -> int:
|
|
| 418 |
tracked.clear()
|
| 419 |
|
| 420 |
clicked = False
|
|
|
|
| 421 |
for scroll_attempts in range(100):
|
| 422 |
try:
|
| 423 |
els = driver.find_elements(By.LINK_TEXT, args.chapter)
|
|
@@ -446,10 +447,10 @@ def main() -> int:
|
|
| 446 |
# 如果没找到或没点击成功,滚动所有可滚动的 div,尝试让章节列表显示出来
|
| 447 |
try:
|
| 448 |
scrolled = driver.execute_script('''
|
| 449 |
-
var
|
| 450 |
var scrolledAny = false;
|
| 451 |
-
for (var i = 0; i <
|
| 452 |
-
var d =
|
| 453 |
if (d.scrollHeight > d.clientHeight && window.getComputedStyle(d).overflowY !== "hidden") {
|
| 454 |
var before = d.scrollTop;
|
| 455 |
d.scrollBy(0, 600);
|
|
@@ -461,8 +462,12 @@ def main() -> int:
|
|
| 461 |
return scrolledAny;
|
| 462 |
''')
|
| 463 |
if not scrolled:
|
| 464 |
-
|
| 465 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 466 |
except Exception:
|
| 467 |
pass
|
| 468 |
time.sleep(1)
|
|
|
|
| 375 |
def main() -> int:
|
| 376 |
ap = argparse.ArgumentParser()
|
| 377 |
ap.add_argument("--book-id", default="SWX0005")
|
| 378 |
+
ap.add_argument("--chapter", default="第二十五回")
|
| 379 |
ap.add_argument("--out", default="out")
|
| 380 |
ap.add_argument("--headless", action="store_true")
|
| 381 |
ap.add_argument("--timeout", type=int, default=20000)
|
|
|
|
| 418 |
tracked.clear()
|
| 419 |
|
| 420 |
clicked = False
|
| 421 |
+
no_scroll_count = 0
|
| 422 |
for scroll_attempts in range(100):
|
| 423 |
try:
|
| 424 |
els = driver.find_elements(By.LINK_TEXT, args.chapter)
|
|
|
|
| 447 |
# 如果没找到或没点击成功,滚动所有可滚动的 div,尝试让章节列表显示出来
|
| 448 |
try:
|
| 449 |
scrolled = driver.execute_script('''
|
| 450 |
+
var els = document.querySelectorAll("div, ul, main, nav, section, aside");
|
| 451 |
var scrolledAny = false;
|
| 452 |
+
for (var i = 0; i < els.length; i++) {
|
| 453 |
+
var d = els[i];
|
| 454 |
if (d.scrollHeight > d.clientHeight && window.getComputedStyle(d).overflowY !== "hidden") {
|
| 455 |
var before = d.scrollTop;
|
| 456 |
d.scrollBy(0, 600);
|
|
|
|
| 462 |
return scrolledAny;
|
| 463 |
''')
|
| 464 |
if not scrolled:
|
| 465 |
+
no_scroll_count += 1
|
| 466 |
+
if no_scroll_count >= 5:
|
| 467 |
+
print(f"[DEBUG] Reached the bottom of the list (tried 5 times). {args.chapter} not found.")
|
| 468 |
+
break
|
| 469 |
+
else:
|
| 470 |
+
no_scroll_count = 0
|
| 471 |
except Exception:
|
| 472 |
pass
|
| 473 |
time.sleep(1)
|