novel-downloader 2.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

novel_downloader/utils/text_utils/text_cleaner.py

@@ -42,7 +42,7 @@ class TextCleaner(Cleaner):
     TextCleaner removes invisible characters, strips unwanted patterns,
     and applies literal replacements in a single pass using a combined regex.
 
-    For regex that never matches, reference:
+    For regex that never matches (r"$^"), reference:
 
     https://stackoverflow.com/questions/2930182/regex-to-not-match-anything
     """
@@ -53,13 +53,14 @@ class TextCleaner(Cleaner):
         """
         Initialize TextCleaner with the given configuration.
 
-        :param config: TextCleanerConfig instance containing:
+        Configuration fields (from ``TextCleanerConfig``):
+          * remove_invisible: whether to strip BOM/zero-width chars
+          * title_remove_patterns: list of regex patterns to delete from titles
+          * content_remove_patterns: list of regex patterns to delete from content
+          * title_replacements: dict of literal replacements for titles
+          * content_replacements: dict of literal replacements for content
 
-            - remove_invisible: whether to strip BOM/zero-width chars
-            - title_remove_patterns: list of regex patterns to delete from titles
-            - content_remove_patterns: list of regex patterns to delete from content
-            - title_replacements: dict of literal replacements for titles
-            - content_replacements: dict of literal replacements for content
+        :param config: A ``TextCleanerConfig`` instance.
         """
         self._remove_invisible = config.remove_invisible
 
@@ -73,20 +74,23 @@ class TextCleaner(Cleaner):
 
         # Build a single combined regex for title:
         #   all delete‐patterns OR all escaped replacement‐keys
-        title_parts = title_remove + [re.escape(k) for k in self._title_repl_map]
-        title_parts.sort(
-            key=len, reverse=True
-        )  # longer first to avoid prefix collisions
-        title_pattern = "|".join(title_parts) if title_parts else r"$^"
-        self._title_combined_rx: Pattern[str] = re.compile(title_pattern)
+        self._title_combined_rx: re.Pattern[str] | None = None
+        if title_remove or self._title_repl_map:
+            title_parts = title_remove + [re.escape(k) for k in self._title_repl_map]
+            # longer first to avoid prefix collisions
+            title_parts.sort(key=len, reverse=True)
+            self._title_combined_rx = re.compile("|".join(title_parts))
 
         # Build a single combined regex for content (multiline mode)
-        content_parts = content_remove + [re.escape(k) for k in self._content_repl_map]
-        content_parts.sort(key=len, reverse=True)
-        content_pattern = "|".join(content_parts) if content_parts else r"$^"
-        self._content_combined_rx: Pattern[str] = re.compile(
-            content_pattern, flags=re.MULTILINE
-        )
+        self._content_combined_rx: re.Pattern[str] | None = None
+        if content_remove or self._content_repl_map:
+            content_parts = content_remove + [
+                re.escape(k) for k in self._content_repl_map
+            ]
+            content_parts.sort(key=len, reverse=True)
+            self._content_combined_rx = re.compile(
+                "|".join(content_parts), flags=re.MULTILINE
+            )
 
     def clean_title(self, text: str) -> str:
         """
@@ -132,11 +136,11 @@ class TextCleaner(Cleaner):
         Remove BOM and zero-width/invisible characters from the text.
 
         Matches:
-          - U+FEFF (BOM)
-          - U+200B ZERO WIDTH SPACE
-          - U+200C ZERO WIDTH NON-JOINER
-          - U+200D ZERO WIDTH JOINER
-          - U+2060 WORD JOINER
+          * U+FEFF (BOM)
+          * U+200B ZERO WIDTH SPACE
+          * U+200C ZERO WIDTH NON-JOINER
+          * U+200D ZERO WIDTH JOINER
+          * U+2060 WORD JOINER
 
         :param text: Input string possibly containing invisible chars.
         :return: String with those characters stripped.
@@ -146,7 +150,7 @@ class TextCleaner(Cleaner):
     def _do_clean(
         self,
         text: str,
-        combined_rx: Pattern[str],
+        combined_rx: Pattern[str] | None,
         repl_map: dict[str, str],
     ) -> str:
         """
@@ -158,17 +162,22 @@ class TextCleaner(Cleaner):
         :param repl_map: Mapping from matched token to replacement text.
         :return: Cleaned text.
         """
+        if not self._remove_invisible and not combined_rx:
+            return text.strip()
+
         # Strip invisible chars if configured
         if self._remove_invisible:
             text = self._remove_bom_and_invisible(text)
 
         # Single‐pass removal & replacement
-        def _sub(match: Match[str]) -> str:
-            token = match.group(0)
-            # If token in repl_map -> replacement; else -> delete (empty string)
-            return repl_map.get(token, "")
+        if combined_rx:
+
+            def _sub(match: Match[str]) -> str:
+                # If token in repl_map -> replacement; else -> delete (empty string)
+                return repl_map.get(match.group(0), "")
+
+            text = combined_rx.sub(_sub, text)
 
-        text = combined_rx.sub(_sub, text)
         return text.strip()
 
 

novel_downloader/utils/text_utils/truncate_utils.py

@@ -11,8 +11,6 @@ __all__ = [
     "truncate_half_lines",
 ]
 
-import math
-
 
 def content_prefix(
     text: str,
@@ -41,22 +39,13 @@ def content_prefix(
 
 def truncate_half_lines(text: str) -> str:
     """
-    Keep the first half of the lines (rounded up), preserving line breaks.
+    Keep the first half of the lines.
 
     :param text: Full input text
     :return: Truncated text with first half of lines
     """
     lines = text.splitlines()
     non_empty_lines = [line for line in lines if line.strip()]
-    keep_count = math.ceil(len(non_empty_lines) / 2)
-
-    result_lines = []
-    count = 0
-    for line in lines:
-        result_lines.append(line)
-        if line.strip():
-            count += 1
-        if count >= keep_count:
-            break
-
+    keep_count = (len(non_empty_lines) + 1) // 2
+    result_lines = non_empty_lines[:keep_count]
     return "\n".join(result_lines)

novel_downloader/utils/time_utils/sleep_utils.py

@@ -16,50 +16,51 @@ import time
 logger = logging.getLogger(__name__)
 
 
-def jitter_sleep(
+def _calc_sleep_duration(
     base: float,
-    add_spread: float = 0.0,
-    mul_spread: float = 1.0,
-    *,
+    add_spread: float,
+    mul_spread: float,
     max_sleep: float | None = None,
-) -> None:
+    *,
+    log_prefix: str = "sleep",
+) -> float | None:
     """
-    Sleep for a random duration by combining multiplicative and additive jitter.
-
-    The total sleep time is computed as:
-
-        duration = base * uniform(1.0, mul_spread) + uniform(0, add_spread)
+    Compute the jittered sleep duration (in seconds) or return None if params invalid.
 
-    If `max_sleep` is provided, the duration will be capped at that value.
+      duration = base * uniform(1.0, mul_spread) + uniform(0, add_spread)
 
-    :param base: Base sleep time in seconds. Must be >= 0.
-    :param add_spread: Maximum extra seconds to add after scaling base.
-    :param mul_spread: Maximum multiplier factor for base; drawn from [1.0, mul_spread].
-    :param max_sleep: Optional upper limit for the final sleep duration.
+    then optionally capped by max_sleep.
     """
     if base < 0 or add_spread < 0 or mul_spread < 1.0:
         logger.warning(
-            "[sleep] Invalid parameters: base=%s, add_spread=%s, mul_spread=%s",
+            "[%s] Invalid parameters: base=%s, add_spread=%s, mul_spread=%s",
+            log_prefix,
             base,
             add_spread,
             mul_spread,
         )
-        return
+        return None
 
-    # Calculate the raw duration
     multiplicative_jitter = random.uniform(1.0, mul_spread)
-    additive_jitter = random.uniform(0, add_spread)
+    additive_jitter = random.uniform(0.0, add_spread)
     duration = base * multiplicative_jitter + additive_jitter
 
     if max_sleep is not None:
         duration = min(duration, max_sleep)
 
-    logger.debug("[time] Sleeping for %.2f seconds", duration)
-    time.sleep(duration)
-    return
+    logger.debug(
+        "[%s] base=%.3f mul=%.3f add=%.3f max=%s -> duration=%.3f",
+        log_prefix,
+        base,
+        multiplicative_jitter,
+        additive_jitter,
+        max_sleep,
+        duration,
+    )
+    return duration
 
 
-async def async_jitter_sleep(
+def jitter_sleep(
     base: float,
     add_spread: float = 0.0,
     mul_spread: float = 1.0,
@@ -67,34 +68,43 @@ async def async_jitter_sleep(
     max_sleep: float | None = None,
 ) -> None:
     """
-    Async sleep for a random duration by combining multiplicative and additive jitter.
-
-    The total sleep time is computed as:
-
-        duration = base * uniform(1.0, mul_spread) + uniform(0, add_spread)
-
-    If `max_sleep` is provided, the duration will be capped at that value.
+    Sleep for a random duration by combining multiplicative and additive jitter.
 
     :param base: Base sleep time in seconds. Must be >= 0.
     :param add_spread: Maximum extra seconds to add after scaling base.
     :param mul_spread: Maximum multiplier factor for base; drawn from [1.0, mul_spread].
     :param max_sleep: Optional upper limit for the final sleep duration.
     """
-    if base < 0 or add_spread < 0 or mul_spread < 1.0:
-        logger.warning(
-            "[async sleep] Invalid parameters: base=%s, add_spread=%s, mul_spread=%s",
-            base,
-            add_spread,
-            mul_spread,
-        )
+    duration = _calc_sleep_duration(
+        base,
+        add_spread,
+        mul_spread,
+        max_sleep,
+        log_prefix="sleep",
+    )
+    if duration is None:
         return
+    time.sleep(duration)
 
-    multiplicative_jitter = random.uniform(1.0, mul_spread)
-    additive_jitter = random.uniform(0, add_spread)
-    duration = base * multiplicative_jitter + additive_jitter
 
-    if max_sleep is not None:
-        duration = min(duration, max_sleep)
+async def async_jitter_sleep(
+    base: float,
+    add_spread: float = 0.0,
+    mul_spread: float = 1.0,
+    *,
+    max_sleep: float | None = None,
+) -> None:
+    """
+    Async sleep for a random duration by combining multiplicative and additive jitter.
 
-    logger.debug("[async time] Sleeping for %.2f seconds", duration)
+    :param base: Base sleep time in seconds. Must be >= 0.
+    :param add_spread: Maximum extra seconds to add after scaling base.
+    :param mul_spread: Maximum multiplier factor for base; drawn from [1.0, mul_spread].
+    :param max_sleep: Optional upper limit for the final sleep duration.
+    """
+    duration = _calc_sleep_duration(
+        base, add_spread, mul_spread, max_sleep, log_prefix="async sleep"
+    )
+    if duration is None:
+        return
     await asyncio.sleep(duration)

novel_downloader/web/main.py

@@ -56,7 +56,7 @@ def web_main() -> None:
     host = "127.0.0.1" if args.listen == "local" else "0.0.0.0"
 
     log_level = get_config_value(["general", "debug", "log_level"], "INFO")
-    setup_logging(log_level=log_level)
+    setup_logging(console_level=log_level)
 
     app.on_startup(mount_exports)
     ui.run(host=host, port=args.port, reload=args.reload)

novel_downloader/web/pages/search.py

@@ -145,9 +145,9 @@ def _build_settings_dropdown(
     Create settings button + anchored menu with initial values from state.
 
     Returns a tuple of getter functions:
-      - get_sites(): list of site keys, or None if none selected
-      - get_psl(): per-site limit (int)
-      - get_timeout(): timeout (float)
+      * get_sites(): list of site keys, or None if none selected
+      * get_psl(): per-site limit (int)
+      * get_timeout(): timeout (float)
     """
     site_cbs: dict[str, Any] = {}
 

{novel_downloader-2.0.0.dist-info → novel_downloader-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 2.0.0
+Version: 2.0.1
 Summary: A command-line tool for downloading Chinese web novels from Qidian and similar platforms.
 Author-email: Saudade Z <saudadez217@gmail.com>
 License: MIT License
@@ -47,6 +47,7 @@ Requires-Dist: aiohttp
 Requires-Dist: lxml
 Requires-Dist: platformdirs
 Provides-Extra: font-recovery
+Requires-Dist: brotli; extra == "font-recovery"
 Requires-Dist: numpy; extra == "font-recovery"
 Requires-Dist: fonttools; extra == "font-recovery"
 Requires-Dist: pillow; extra == "font-recovery"

{novel_downloader-2.0.0.dist-info → novel_downloader-2.0.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
-novel_downloader/__init__.py,sha256=gvhm67MQNWoL_G7z3QqXrhgp7Cw3xc5KqU8-UpCKQ0s,218
+novel_downloader/__init__.py,sha256=rCDXxBxrYs3WYnanTn5QZYhg2-rG48Ry2DS7urOkIws,218
 novel_downloader/cli/__init__.py,sha256=okUd_09fBWx8lz3zx3329dIK0xNRlNQJkUzDXYoSE1U,167
 novel_downloader/cli/clean.py,sha256=VaiJox75-ZuXvSDFMaiAUawEbdtuEUsnsVWZGKuirJ4,2395
 novel_downloader/cli/config.py,sha256=W4-f59dK5jdlg_9XDwGIyzd6VtpyNpB9U4qcxfso8Xg,3598
-novel_downloader/cli/download.py,sha256=-59icT24iU_l6LhAJqQaxLAogJAr0hRxd-_RfcjQbdI,7587
-novel_downloader/cli/export.py,sha256=iSIbSXreYRTs_KfZS4eJ0cJoMgoutwdza88JGoxQMlw,2573
+novel_downloader/cli/download.py,sha256=2iEW137yI-YbBE-4Um7h4IQRZzX0qbPILwCQeTEfU8o,7603
+novel_downloader/cli/export.py,sha256=u1Cu-2PcVBny8cMVPS0lTCs34XXcVljkXBZpNUCQQKw,2577
 novel_downloader/cli/main.py,sha256=GKtxeumw_VvWManp52Am538jL2t7xz7yVrGIaxrvSVk,1009
 novel_downloader/cli/search.py,sha256=_Ci4fa1ECiYmBZI2OZBxzwddYGIvdUyIp4AOIJiL1Ds,3641
-novel_downloader/cli/ui.py,sha256=Gme3J4M_eK23cDWepMs8-c0zfIanSSXERnYSWYkerE4,3992
+novel_downloader/cli/ui.py,sha256=XyvgTlsiV1NkGLWfCt6WvTIm8h8hXq5_RSfCdUwy8P0,4024
 novel_downloader/config/__init__.py,sha256=gwaDMlcBX7Lw8Hi8dY2HxNEt9ysMhIFNhkziyjramWo,405
-novel_downloader/config/adapter.py,sha256=Y8Dt5GflbCiOwjBbTN7D3O5JPnkssbJDYGtYOYzEt1M,11561
+novel_downloader/config/adapter.py,sha256=4pZo-9PA7g2H1tybqdUeGOODZCKtpVyAKUg23VX-LBA,13444
 novel_downloader/config/file_io.py,sha256=ncKk7rj07UnYYVEPR_RHS2D5igMSv8xaHySNvJQWhB8,6495
-novel_downloader/core/__init__.py,sha256=20zZKxemHFQv8noyftPTcen6Okq-AJS5GIlwn8Zc7AA,1157
+novel_downloader/core/__init__.py,sha256=oCmWj9t7CEyNfew5O25YeaMPeMvXt082jprKAPMffKk,1166
 novel_downloader/core/archived/deqixs/fetcher.py,sha256=JGTLWI-d5jLULB-vS2VUeajwp7tHlb9trUCF4lJrdiQ,3432
 novel_downloader/core/archived/deqixs/parser.py,sha256=udM6MYdunPVYwUNjEoBDjffHR_SsXPvv_EqsCMJJVrE,4169
 novel_downloader/core/archived/deqixs/searcher.py,sha256=ezXCQ0pM8AqmTXmkzLrOSebTvHg_GouIywIE23c5hwY,2920
@@ -33,11 +33,11 @@ novel_downloader/core/exporters/txt_util.py,sha256=-pkwMFh-69FHEziTW4LiW3-u6f1Gq
 novel_downloader/core/exporters/common/__init__.py,sha256=8qVMdtM_hLo3D3bMMQYYL10I0evHy1BgaceqOMTu9OE,259
 novel_downloader/core/exporters/common/epub.py,sha256=OZV8KCE9otYLjlDKEogFQ5KElUAXGJwV5zSCtm59FOw,5961
 novel_downloader/core/exporters/common/main_exporter.py,sha256=uBx67rBaeijZWt3cZDR7xipf-P_3ShyypZROxe8CjEQ,2165
-novel_downloader/core/exporters/common/txt.py,sha256=Nzzo60ksECYkBvjSooZYPUFNbeD7hbz6jmTUSYVhHxk,4721
+novel_downloader/core/exporters/common/txt.py,sha256=Nm4MW0rEIzX-7jzOFTaS4fdkzB1T8zBrIHpM-W7niN0,4755
 novel_downloader/core/exporters/linovelib/__init__.py,sha256=AFjdUyFalrU8n_OjxqYENZ5zVcfYPONgWbvFkI0Sgls,250
 novel_downloader/core/exporters/linovelib/epub.py,sha256=BiYgX61lZdgYeipnNuzMHmAjjSXnofs1eKoPR9UduDg,10703
 novel_downloader/core/exporters/linovelib/main_exporter.py,sha256=qFMKfPobNWTDzW8CLr6FcNpkdqAuH5PMjqAQA_Jb78w,1938
-novel_downloader/core/exporters/linovelib/txt.py,sha256=5k7ZKVPOtalOeTr9xFca3zkofNKa4Wg0NdKk-lujC58,4433
+novel_downloader/core/exporters/linovelib/txt.py,sha256=cdB_5oZs1SSPZ-TpemZv89goSVpj3jV23A52DPXhYDc,4467
 novel_downloader/core/fetchers/__init__.py,sha256=V0BXwjULLODbS69YRRfvivEB4HVdUxo4tFMZ44qT6mU,1982
 novel_downloader/core/fetchers/aaatxt.py,sha256=fupx1NLqHc3PH61_cSbZ0lafkmLmcs2R3FI5z56YyC4,2417
 novel_downloader/core/fetchers/b520.py,sha256=IuIci62rHLtad3eIU-iR9be56vw7w3W4ctpvQpkOg3I,2458
@@ -56,7 +56,7 @@ novel_downloader/core/fetchers/linovelib.py,sha256=5oUji6UkM0XXkDmOPiWelhSo6C0Nk
 novel_downloader/core/fetchers/piaotia.py,sha256=DPtBSBFmrU3Y3ha7u83sx5S9GXTpNxFj5VZtsP6pkmk,3220
 novel_downloader/core/fetchers/qbtr.py,sha256=EGw8p-J01wu1iJmz4Vm6wjXPuTgVt6Y4BIY8Aun7zsQ,3094
 novel_downloader/core/fetchers/qianbi.py,sha256=sWMpF78ZXBBVYs-DdUp0LG7khO84AMJzFYkDu_GSqfA,3174
-novel_downloader/core/fetchers/qidian.py,sha256=pk_uLdCCnCYRD_OaJNhR17UCwmI6iH7mKMeKfEofgZY,10330
+novel_downloader/core/fetchers/qidian.py,sha256=9CqpWu1qguAgYb6NmhSIA2O59S_S700H_PsbMf2iZsI,10329
 novel_downloader/core/fetchers/quanben5.py,sha256=TkLFJOfpMOpKNkq2D9R0HI33zzAV-KuHccXquu6CZZ0,2776
 novel_downloader/core/fetchers/rate_limiter.py,sha256=Z05dZOATi_-Su14qRmhVinArfLJ0QWpzgDShs2jHSR8,2714
 novel_downloader/core/fetchers/registry.py,sha256=z9DDTUjc2r-Xiq3MqaPfV_3EmQBXr2TK_G8eARnblkA,1580
@@ -75,17 +75,17 @@ novel_downloader/core/fetchers/yibige.py,sha256=CJO26gMj_36XQMFVVnXDr8aoTQAqBA6A
 novel_downloader/core/interfaces/__init__.py,sha256=YwDOPw_UCjuAE5u_LpUYxXjOH4X2kNMXrmUoBa5jp2Q,490
 novel_downloader/core/interfaces/downloader.py,sha256=nGY2LYCCBzrKhs612L5tevGG8kJp_XfCyKvqjXEIeoI,1763
 novel_downloader/core/interfaces/exporter.py,sha256=R62GPGzfGQu0B-7nu6y-PTnYF_TkrGir3XG19AW6jNE,1649
-novel_downloader/core/interfaces/fetcher.py,sha256=XZ320Fi72nDORQKFUBbtybWmQ2ZoJ63gpVXBurodOrQ,3669
-novel_downloader/core/interfaces/parser.py,sha256=NzpKjh-P2IwNE0BUmaEKU49qhPNbLhodZMCj2uSkOkg,1317
+novel_downloader/core/interfaces/fetcher.py,sha256=2ESTszn-GrXj9rxYr_cQy86R1iCvWH-LbJx63j933YM,3669
+novel_downloader/core/interfaces/parser.py,sha256=B_HsE_PshnUjz-QibBpuNht6whN9gboW-k1BAsnMe6M,1317
 novel_downloader/core/interfaces/searcher.py,sha256=1orneqFtwcqM5sFBKmhpWFbHk5bV7oEp0mN_77lgy6E,587
 novel_downloader/core/parsers/__init__.py,sha256=VfGEMS0PUQLkmc32xiz7l5rCPgzuy3Vz-1ZDxaYNp1Q,1927
 novel_downloader/core/parsers/aaatxt.py,sha256=1NCrhbbpd5FUi0ybMX2LYf6Sss4pY3eDXTXk7MEkrkk,3633
 novel_downloader/core/parsers/b520.py,sha256=SUiY1IYOZmu-tY-owbQHMKUyDFxwwOI6bgdjyNw_daM,3254
-novel_downloader/core/parsers/base.py,sha256=tdq7MuNezN5xwZJ5DUYKUOki9hisPJ_wyt9LdG3ocVo,4634
+novel_downloader/core/parsers/base.py,sha256=R6xbT9ezFWcdFhqCItj2iigwQSB3MNrH9joC14vx2AI,4689
 novel_downloader/core/parsers/biquyuedu.py,sha256=IpZfL2AC0oUq5Gx8iqwTH8sItxtzpxvDRKaMmtYf_xU,3867
 novel_downloader/core/parsers/dxmwx.py,sha256=uj3tj36d8lnXbgFvmpHzrvv9oDYuMXWZCb0d8I32GfA,5006
-novel_downloader/core/parsers/eightnovel.py,sha256=Yw9tt24SsAe3Y6xyXVgo1EUAs36_twPhoF1toUZZjAc,7290
-novel_downloader/core/parsers/esjzone.py,sha256=vGcziiCmrkJeNO0BUBrFJOKg83k4buvysqInUVIJXJ4,7958
+novel_downloader/core/parsers/eightnovel.py,sha256=M-BFJcqaBjNlf5PhoD-qscTR9o0ydRhQQAMbHzh1Z-o,7294
+novel_downloader/core/parsers/esjzone.py,sha256=WeBwFn8waUtiZ3rzGJaiuB21ga7mnMnuBCA-0XnXOQI,7958
 novel_downloader/core/parsers/guidaye.py,sha256=o1d987B5hkCEIVHYhszSavwKJFAErZVwpDaUPkSNUh4,3879
 novel_downloader/core/parsers/hetushu.py,sha256=WUG4E9lvDJsa_l1xezYt0epPPJ4V9y_C4wwqWB8sxJs,4047
 novel_downloader/core/parsers/i25zw.py,sha256=qILX6HQifu0hLJDNFc7XCqUNSQpfALhVgPC9jEGQt4g,4221
@@ -105,22 +105,16 @@ novel_downloader/core/parsers/tongrenquan.py,sha256=y3ok9g-BzA2YVM4KqoNPPpclE0wd
 novel_downloader/core/parsers/ttkan.py,sha256=_8nc6diogbb9uGHm_lXYJT-RHR9p76o7ARn4NPom2-E,3564
 novel_downloader/core/parsers/wanbengo.py,sha256=boEnK1gLLpqmf5EUFY9gVEhBxqxYrVka9ou_mDGZ4co,6407
 novel_downloader/core/parsers/xiaoshuowu.py,sha256=k8j0TY5t7s0n1f-FWuRTZ-eN3A8p-_xnKy7-kp2deK4,5328
-novel_downloader/core/parsers/xiguashuwu.py,sha256=i_CpFKjfcGviOjT3fveDvDsaMmxHub9MOrCbWRySbH8,14448
+novel_downloader/core/parsers/xiguashuwu.py,sha256=1Xq00oRcb-vGskisbkNJuSmBGWNK7NpPOHbQHdMks_k,14223
 novel_downloader/core/parsers/xs63b.py,sha256=A02abnMtsnWTomx-Hcfr97HFnNO38X9mmqKxHKrS610,5312
 novel_downloader/core/parsers/xshbook.py,sha256=WwIGXEBAY8h-MLeApB1oVko_g3HF1Uj0X-Hko3TTrJ8,3995
 novel_downloader/core/parsers/yamibo.py,sha256=B2ijBHCS0JW0I387LH8gDjevwakOE0RRKaKRsV4zo7A,5018
 novel_downloader/core/parsers/yibige.py,sha256=K_nQ1SwVKLndgzlRvoTd2wd0tWXKb-T02c0sE6-bS5M,4846
 novel_downloader/core/parsers/qidian/__init__.py,sha256=ScY9penE8b1m5HZGu6C1XwbzuqKbeGVCvli0J-xzzKs,173
-novel_downloader/core/parsers/qidian/book_info_parser.py,sha256=RTg6Z2jaLEUVJXKzcdxG1rqBdAhu_gmxsq0zcD9vyAE,3043
-novel_downloader/core/parsers/qidian/chapter_encrypted.py,sha256=eTIOTwlu_7DiAkul58tPOOlCSxMymcSfr_m4AlnkEdU,15386
-novel_downloader/core/parsers/qidian/chapter_normal.py,sha256=JitsHCz9FSvslAbFLPdtF0FNr5V311Uj7K0zq7MUDwA,3738
-novel_downloader/core/parsers/qidian/chapter_router.py,sha256=foVMlWtE-qUOvJD_4EDiuAVaNkFdeV_ZTCvS5IL7Orc,1957
-novel_downloader/core/parsers/qidian/main_parser.py,sha256=w6s9RkcatA34chyzi4buFKew4-bIexlSHAIR1zBGIxE,2754
-novel_downloader/core/parsers/qidian/utils/__init__.py,sha256=FuV7f-h76sk1g5BaqWOhsgh9uTykXA7MZ97kmkOB_lY,664
+novel_downloader/core/parsers/qidian/main_parser.py,sha256=3JpvTFbL3yzGE7sfjgRHtUTid8_TVNaqBYyMNVnTwkM,29833
+novel_downloader/core/parsers/qidian/utils/__init__.py,sha256=7aCxmMDQ3wkAPPtVIQ_YYprzE8V1IcHh2LK5S2rEc4U,266
 novel_downloader/core/parsers/qidian/utils/decryptor_fetcher.py,sha256=idwsRx9Er5SRb3b_tmKwNxfOmUWR0QwpVf_zpDRJxuw,4687
-novel_downloader/core/parsers/qidian/utils/fontmap_recover.py,sha256=kuEPRnGn4GHVh3uQ8u8sg55LUaYYuavftxO9gyAR3ZM,4918
-novel_downloader/core/parsers/qidian/utils/helpers.py,sha256=_HAOWW3HHtq2FtYlYU1FIebZdRmCo1Rfmh_WC9p_ZLU,3325
-novel_downloader/core/parsers/qidian/utils/node_decryptor.py,sha256=MQQUI9nNpM23K0sA9bRVhs7pbQX6OvMc1NgvM28gHsU,5949
+novel_downloader/core/parsers/qidian/utils/node_decryptor.py,sha256=WY2rG2S7GlIqDiFBBJaGW4XJorCwVHfbiYIeytkkmNo,5949
 novel_downloader/core/searchers/__init__.py,sha256=pCCK1rxfQP8djdsRnpxoVgANe6CTpbP7DNbNond_1P4,1379
 novel_downloader/core/searchers/aaatxt.py,sha256=KHaX1dpDBaAJz-_7UlaTtnMbFlTplWHaFyOfCkn4gX4,3717
 novel_downloader/core/searchers/b520.py,sha256=L2fkf1_LxUREdPJJXbSN5c00EXwWVeMwWpXKN144k9c,2621
@@ -143,8 +137,8 @@ novel_downloader/core/searchers/ttkan.py,sha256=Y-qjePD7zQx8RUgASTuz4yu5fzT5MOJg
 novel_downloader/core/searchers/xiaoshuowu.py,sha256=gAS3OpoMwfksEtlXPL5XPrfD7KVprl8YA7HGn3gGANg,4132
 novel_downloader/core/searchers/xiguashuwu.py,sha256=YWxOQpXUhMMsgxt7zc51rtdbe6mn9yv5Vzeg63OCJlQ,2952
 novel_downloader/core/searchers/xs63b.py,sha256=T4QUQphYFvnbnENxFbYVNtZMi2QhXypxOJU-FjjVYwU,3443
-novel_downloader/locales/en.json,sha256=T0Apt75RC9Uua6quGckZPMzkh0XB3uy_JkXzRxwRllk,3948
-novel_downloader/locales/zh.json,sha256=LU691ypbrR903ie2BKHLgI1U4G6_fYpT4kcztMYO5-8,3785
+novel_downloader/locales/en.json,sha256=w3TA-AtsQE2C1EVf5tNiOQRnaaXEaXX88-0Bb3xWdU8,3942
+novel_downloader/locales/zh.json,sha256=XRku9SHycZ8zP0YYBwchBAg4yYjCWpgCLDItW8cmUcI,3779
 novel_downloader/models/__init__.py,sha256=U7ks1ieTm-VzmH3NcH0Fym7c1zfywIZcBGPOUBWuVLo,690
 novel_downloader/models/book.py,sha256=kim6Tt0pDDvOhGx6jnRp28BP79yhhsyNiUp56I0cAP8,875
 novel_downloader/models/config.py,sha256=QNiw1XhbzjAYbfLAZ1bTIQ21nciNxnYszGVtXVG3Uk0,2211
@@ -157,54 +151,56 @@ novel_downloader/resources/images/volume_border.png,sha256=2dEVimnTHKOfLMhi7bhkh
 novel_downloader/resources/js_scripts/qidian_decrypt_node.js,sha256=spNrk_gXI7pPW9abr4XGc2LASMe1UuN4BUe4cH24L8s,2195
 novel_downloader/resources/json/linovelib_font_map.json,sha256=F1IlEcvXGcagnZCu4Gw2vQ2NLnhy6cJOLhabukqnftw,67854
 novel_downloader/resources/json/xiguashuwu.json,sha256=AT8KSFBWuiHj4Ggz3O1LqED0Tw22k0A4-V4OziHbqfo,16471
-novel_downloader/utils/__init__.py,sha256=Mu3FyLH_9wp7zHtIHfSTWvdNkXYzOAHYMoGMDJKk4cg,920
-novel_downloader/utils/chapter_storage.py,sha256=2l5mRHYQd7rarBB4UeUo4Lwood-cqY0LHvXb2KPyFqQ,10365
-novel_downloader/utils/constants.py,sha256=KeTL_MygD0VdvEUeDFaHuqITIzU_LdD5huNQHC7uCDM,3312
-novel_downloader/utils/cookies.py,sha256=diWQj-cMvH7eT2P1X-lzGzsWLcfhaPW2wvMVnwCQwkQ,1735
-novel_downloader/utils/fontocr.py,sha256=gaNH4isYY7zFE--gqtM1YN6bIjWTA-G-60XCAsbja8o,6494
+novel_downloader/utils/__init__.py,sha256=_l77NlxmGA3HHGSwK68o4_Nc7xRaVP8Bo8SUuImP5Uk,867
+novel_downloader/utils/chapter_storage.py,sha256=7jpVdOguuylnjsJi_yQ-jCMIPljtJWsq_NqXMDDv0lQ,10315
+novel_downloader/utils/constants.py,sha256=uff08ll68TD8HwITR-uZ7j_2bQjKPso0-ryKmYhtjAU,3196
+novel_downloader/utils/cookies.py,sha256=Z_9mjJYfhv6xPVgsm7BzCpWeMTcPKoxAoUFWZYuEFWM,2117
 novel_downloader/utils/i18n.py,sha256=86Wz4zT0_YTnmOSS6cliqO_uMgJJdfC-hNLyqZnXgvU,1050
-novel_downloader/utils/logger.py,sha256=exOM7pUb8n_AchmIxLNlaZySqsMQjViL4KEMilZ8t04,3013
-novel_downloader/utils/network.py,sha256=UzqK6xuQQfV4gFFbmNgy09L3QAlqX-CFeF6urfKRJyg,4675
+novel_downloader/utils/logger.py,sha256=QuPyblYOIXEa4X0YBHLZgwbv1ZhkPNq159qyGmFKOno,3551
+novel_downloader/utils/network.py,sha256=AIbM2kEfA9OjkMluFRKqGZIY2ZfNxVAoPnUHUkKkzgw,3625
 novel_downloader/utils/state.py,sha256=QHfvS9CrO08fRZLNM0B_s0n5XIz7ap20NdAfesQI0Ek,1852
-novel_downloader/utils/crypto_utils/__init__.py,sha256=33j0dezsuX3LhkfXj-FImEgU7G1IVmjjZW-4FrDDT0o,196
+novel_downloader/utils/crypto_utils/__init__.py,sha256=MOl8pb73dRk8yQDuh2RZULnM3mn9VnJnOkh0SWcvaPs,136
 novel_downloader/utils/crypto_utils/aes_util.py,sha256=46vKY1CxEnHgJE9t2CRzsrGyUoLRjBysCJCeSF5AiqU,2878
 novel_downloader/utils/crypto_utils/aes_v1.py,sha256=_jW86_WyUTJfOzqYbZ6QvNPF-V8YRaqaOsyLjMsO610,34247
 novel_downloader/utils/crypto_utils/aes_v2.py,sha256=OAsMnsztkJilqo8jM6nkrPMyujPqgGhohd-TcwW6fVA,48945
-novel_downloader/utils/crypto_utils/rc4.py,sha256=3h9PBLraTow7TGiV60jI3zh4ZQH2ohaizJ8LThB55Pk,1934
-novel_downloader/utils/epub/__init__.py,sha256=SaygR4gIuUWhFxgmmSzv4unRMxNMZPyIX4x2-_26yvc,722
-novel_downloader/utils/epub/builder.py,sha256=apuzG7UzYcEEreMpf9Dez06-laQQg6EGGvl3PQGpBFA,11664
-novel_downloader/utils/epub/constants.py,sha256=3fjJIr-5msO1sV2hjYHBiUpEvm0mQm5AsUlMOR03O_M,3080
-novel_downloader/utils/epub/documents.py,sha256=8IgznHBLzaLgzxWJCHGDM4QuE8JdEDI7T3zuA9IHAbE,9868
-novel_downloader/utils/epub/models.py,sha256=x9la6RKmhOTUkcsLSzM7qzThmRbyWZxqaRf39kY6IPo,2479
-novel_downloader/utils/epub/utils.py,sha256=Jg1Xjii6KMVNMKbp6IkWxbwq_ILaEpgqp2vHN8i7P40,5084
+novel_downloader/utils/crypto_utils/rc4.py,sha256=SbC0oAdg2N7LWMnq9YbNh-zChI8SfpeBiijTPxFkYFc,1319
+novel_downloader/utils/epub/__init__.py,sha256=77WorOLdsaxNoiuDPVxvQkiU49NW774bf3E7erPBv1I,725
+novel_downloader/utils/epub/builder.py,sha256=2Vd7qD12vWqu05hVHrcgn5gfRzxGklY88nv8unuXF4M,11676
+novel_downloader/utils/epub/constants.py,sha256=8r0TmDkGhBVpLNQXS4eIhC2WYwOvFEmpVDF7Mxzm5sA,3090
+novel_downloader/utils/epub/documents.py,sha256=UijMa8yHpleZLUtRrwwTsOPZlqYlC5-qqXEuKh_StPI,9882
+novel_downloader/utils/epub/models.py,sha256=CppM1qIC_G53L-lbouJO-pBBKLMTRfMvOM2PUOSPT78,2489
+novel_downloader/utils/epub/utils.py,sha256=7eRYXUZFZ3NQU69UDwLK_yxiPQWpRhxBPhzKkQSTS0s,5090
 novel_downloader/utils/file_utils/__init__.py,sha256=PIE96UKkI73wNr5v8kbP159BIbkEwsOQa9iEFr5RGUw,366
-novel_downloader/utils/file_utils/io.py,sha256=Q5s2p4-HIAEV1_PLrpmHkGuXGVYPWkKoHOwjRVgru-w,3397
-novel_downloader/utils/file_utils/normalize.py,sha256=v0ZRGcuZ9KMj0GTgAMPCwSBnYkEz8LCnW5dJYjf_jQk,2023
-novel_downloader/utils/file_utils/sanitize.py,sha256=2hoBAleu6n3VhL6IP1df2x0-7mLVAxg1ef6Ogg-ZLu4,1922
+novel_downloader/utils/file_utils/io.py,sha256=bF1q38BdwjTkM8ylfQGczWAcAMHI0gBB5xNkYwTYqrk,2167
+novel_downloader/utils/file_utils/normalize.py,sha256=j8d6kmiQyafa-E8NjTv33uUrnNDoxyJ18orXfS5J_Gw,1708
+novel_downloader/utils/file_utils/sanitize.py,sha256=IuJA2JjcrxxOnJtehPLBpBNOuyNbj97TUZvw-vXB9PE,1713
+novel_downloader/utils/fontocr/__init__.py,sha256=lWT8hVKeuYatEanyw6EjlgPidlyWSMkgCiRliEG_VtA,314
+novel_downloader/utils/fontocr/core.py,sha256=6-JhRo6fvdFxxJBsGSaKcyTh3PZSlGSkAIdJwzvShas,7475
+novel_downloader/utils/fontocr/loader.py,sha256=TGSv9qq-jomky4h6ezr6uoUTgF3-FP385vP-LS7YlBY,1300
 novel_downloader/utils/text_utils/__init__.py,sha256=cr0HCvgQFJE2ZEXqjkkmrOA7PnH50dKegrjdpIytUJs,601
 novel_downloader/utils/text_utils/diff_display.py,sha256=5zvVtzsLbRxmUnn_dWUsXFaq6hch02OlOpqKYP8GB3g,2491
 novel_downloader/utils/text_utils/numeric_conversion.py,sha256=RJ3L5GBxgNEQYJ7xFoihLVsjGcObBfpUAk_Gz5MxlkA,6627
-novel_downloader/utils/text_utils/text_cleaner.py,sha256=9-Ymi6H9BDBv1Sjk2gE9fCG4G3A8Lut-n2sfAyeyH2I,6124
-novel_downloader/utils/text_utils/truncate_utils.py,sha256=GeQCczW0jAHSeDMxx0qCRtnvT-CH1-KjqJq2JBpIv7U,1483
+novel_downloader/utils/text_utils/text_cleaner.py,sha256=9GbJChhZQGW06LApnHNzy6t5gS73AA9BTBigBn9qgcs,6410
+novel_downloader/utils/text_utils/truncate_utils.py,sha256=xg5nlQvq6O1g3K-I64aTZvtnesN0P5QBGUVCPj09g8s,1284
 novel_downloader/utils/time_utils/__init__.py,sha256=XbBeSbpNqiJy7Lsv-_udz29hPnIY53F0Drbuh730y44,331
 novel_downloader/utils/time_utils/datetime_utils.py,sha256=ECidI5yvWVia8BWWLu7U0O0YYMIKgJwzWQmOuA_un3U,4499
-novel_downloader/utils/time_utils/sleep_utils.py,sha256=g31qs1Uyng8GBhyqrvMpxBK2Xqr054xDlA1g8X5cZhk,3062
+novel_downloader/utils/time_utils/sleep_utils.py,sha256=uwQfnhFHqNOku8UwUJ7btD2N0NgDjY925QKDzT-9_sE,3000
 novel_downloader/web/__init__.py,sha256=ga8qRQhYcGEiL0WKhSSyldLxkOEfrq-UU71T7MYv7EU,174
-novel_downloader/web/main.py,sha256=p8iq5VejxuvcJsgM20qDahBsrxK4PeL96O7_65Fa3JI,1779
+novel_downloader/web/main.py,sha256=ZzQcpJkAZb7tRlBkub6LGggNrbM4gtrI4nb-MyiUAlY,1783
 novel_downloader/web/components/__init__.py,sha256=fxBI7rpAQvdZU3obR6_-bFqgmA7nzvRpW05Rw3b4jp8,193
 novel_downloader/web/components/navigation.py,sha256=m-rjbNRlYjqXsu2dq5PdCzpqy7oW6_otra2ZufRsh1c,1156
 novel_downloader/web/pages/__init__.py,sha256=KP_aH8y8dtCeRze8jDJ4tC3Ft7UTGhlW8ZKDdKPdwcM,383
 novel_downloader/web/pages/download.py,sha256=Qqq4GAZaiMRAuCjBvWiof6kwzSz0yrAj5LWN5EEldqo,2600
 novel_downloader/web/pages/progress.py,sha256=whWduqLvQ1PPZpDNVfvFCVaFgFhD87LT4CDb8JuqD_w,5207
-novel_downloader/web/pages/search.py,sha256=Tgy4XgMoD2tovkGvSj9mMWBzWtO_FUGQATHEpzCSgx0,10235
+novel_downloader/web/pages/search.py,sha256=qV_jgtQtNnzT_EWXUeEZfw1ieOxbaXcx4JSs-UQuS4Q,10235
 novel_downloader/web/services/__init__.py,sha256=kLW0uyqudnlHtSsMrrghmL6P1-VDrseggNdB3cR5jLA,316
 novel_downloader/web/services/client_dialog.py,sha256=JwYV8bjxPxLQsuheC8rk_jaeODolz5X9Wo64MsXZoyc,5679
 novel_downloader/web/services/cred_broker.py,sha256=_R2Szqg5qRBHrFujTlPxrrMpQsnfNozjLUxJ5HhD8_c,2939
 novel_downloader/web/services/cred_models.py,sha256=8nXbVoAIz3QokctrCVm-8lSnKgCIFhMM6TuaNq6bFGU,846
 novel_downloader/web/services/task_manager.py,sha256=V6Pp92ZB9aNlliZbdwcaNUojioY1_BGAMGCo9Okob7w,8624
-novel_downloader-2.0.0.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
-novel_downloader-2.0.0.dist-info/METADATA,sha256=V1Xc8HvvlY-J2S6aqP2Hll5vVxZs3aUwrPVQXOGsXV0,6454
-novel_downloader-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-novel_downloader-2.0.0.dist-info/entry_points.txt,sha256=nIgnurS4J6_ce3oIBFV87I1pPwBofuRQvxkoRGn4yEU,112
-novel_downloader-2.0.0.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
-novel_downloader-2.0.0.dist-info/RECORD,,
+novel_downloader-2.0.1.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
+novel_downloader-2.0.1.dist-info/METADATA,sha256=1Mw3aNRkbCiKXaTXJvxzICtInOZEVTpY4kGok3CZ19U,6502
+novel_downloader-2.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+novel_downloader-2.0.1.dist-info/entry_points.txt,sha256=nIgnurS4J6_ce3oIBFV87I1pPwBofuRQvxkoRGn4yEU,112
+novel_downloader-2.0.1.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
+novel_downloader-2.0.1.dist-info/RECORD,,

novel_downloader/core/parsers/qidian/book_info_parser.py

@@ -1,89 +0,0 @@
-#!/usr/bin/env python3
-"""
-novel_downloader.core.parsers.qidian.book_info_parser
------------------------------------------------------
-
-This module provides parsing of Qidian book info pages.
-
-It extracts metadata such as title, author, cover URL, update
-time, status, word count, summary, and volume-chapter structure.
-"""
-
-import logging
-import re
-from datetime import datetime
-
-from lxml import html
-
-from novel_downloader.models import BookInfoDict, ChapterInfoDict, VolumeInfoDict
-
-logger = logging.getLogger(__name__)
-
-
-def _chapter_url_to_id(url: str) -> str:
-    return url.rstrip("/").split("/")[-1]
-
-
-def parse_book_info(html_str: str) -> BookInfoDict | None:
-    """
-    Extract metadata: title, author, cover_url, update_time, status,
-    word_count, summary, and volumes with chapters.
-
-    :param html_str: Raw HTML of the book info page.
-    :return: A dict containing book metadata.
-    """
-    doc = html.fromstring(html_str)
-
-    book_name = doc.xpath('string(//h1[@id="bookName"])').strip()
-
-    author = doc.xpath('string(//a[@class="writer-name"])').strip()
-
-    book_id = doc.xpath('//a[@id="bookImg"]/@data-bid')[0]
-    cover_url = f"https://bookcover.yuewen.com/qdbimg/349573/{book_id}/600.webp"
-
-    ut = doc.xpath('string(//span[@class="update-time"])')
-    ut = ut.replace("更新时间:", "").strip()
-    if re.match(r"^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$", ut):
-        update_time = ut
-    else:
-        update_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-    serial_status = doc.xpath('string(//p[@class="book-attribute"]/span[1])').strip()
-
-    tags_elem = doc.xpath('//p[contains(@class,"all-label")]//a/text()')
-    tags = [t.strip() for t in tags_elem if t.strip()]
-
-    word_count = doc.xpath('string(//p[@class="count"]/em[1])').strip()
-
-    summary_brief = doc.xpath('string(//p[@class="intro"])').strip()
-
-    raw = doc.xpath('//p[@id="book-intro-detail"]//text()')
-    summary = "\n".join(line.strip() for line in raw if line.strip())
-
-    volumes: list[VolumeInfoDict] = []
-    for vol in doc.xpath('//div[@id="allCatalog"]//div[@class="catalog-volume"]'):
-        vol_name = vol.xpath('string(.//h3[@class="volume-name"])').strip()
-        vol_name = vol_name.split(chr(183))[0].strip()
-        chapters: list[ChapterInfoDict] = []
-        for li in vol.xpath('.//ul[contains(@class,"volume-chapters")]/li'):
-            a = li.xpath('.//a[@class="chapter-name"]')[0]
-            title = a.text.strip()
-            url = a.get("href")
-            chapters.append(
-                {"title": title, "url": url, "chapterId": _chapter_url_to_id(url)}
-            )
-        volumes.append({"volume_name": vol_name, "chapters": chapters})
-
-    return {
-        "book_name": book_name,
-        "author": author,
-        "cover_url": cover_url,
-        "update_time": update_time,
-        "word_count": word_count,
-        "serial_status": serial_status,
-        "tags": tags,
-        "summary_brief": summary_brief,
-        "summary": summary,
-        "volumes": volumes,
-        "extra": {},
-    }