novel-downloader 1.3.3__py3-none-any.whl → 1.4.0__py3-none-any.whl

novel_downloader/utils/cookies.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.utils.cookies
+------------------------------
+
+Utility for normalizing cookie input from user configuration.
+"""
+
+import json
+from collections.abc import Mapping
+from email.utils import parsedate_to_datetime
+from http.cookies import SimpleCookie
+from pathlib import Path
+
+
+def resolve_cookies(cookies: str | Mapping[str, str]) -> dict[str, str]:
+    """
+    Parse cookies from a string or dictionary into a standard dictionary.
+
+    Supports input like:
+        - "key1=value1; key2=value2"
+        - {"key1": "value1", "key2": "value2"}
+
+    :param cookies: Cookie string or dict-like object (e.g., from config)
+    :return: A normalized cookie dictionary (key -> value)
+    :raises TypeError: If the input is neither string nor dict-like
+    """
+    if isinstance(cookies, str):
+        filtered = "; ".join(pair for pair in cookies.split(";") if "=" in pair)
+        parsed = SimpleCookie()
+        parsed.load(filtered)
+        return {k: v.value for k, v in parsed.items()}
+    elif isinstance(cookies, Mapping):
+        return {str(k).strip(): str(v).strip() for k, v in cookies.items()}
+    raise TypeError("Unsupported cookie format: must be str or dict-like")
+
+
+def parse_cookie_expires(value: str | None) -> int:
+    if not value:
+        return -1
+    try:
+        return int(value)
+    except (ValueError, TypeError):
+        try:
+            dt = parsedate_to_datetime(value)
+            return int(dt.timestamp())
+        except Exception:
+            return -1
+
+
+def find_cookie_value(state_files: list[Path], key: str) -> str:
+    for state_file in state_files:
+        try:
+            with state_file.open("r", encoding="utf-8") as f:
+                data = json.load(f)
+        except Exception:
+            continue
+
+        cookies = data.get("cookies", [])
+        for cookie in cookies:
+            if cookie.get("name") != key:
+                continue
+            value = cookie.get("value")
+            if isinstance(value, str):
+                return value
+    return ""

novel_downloader/utils/crypto_utils.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 novel_downloader.utils.crypto_utils
 -----------------------------------
@@ -8,11 +9,6 @@ Generic cryptographic utilities
 from __future__ import annotations
 
 import base64
-import hashlib
-import json
-import random
-import time
-from typing import Any
 
 
 def rc4_crypt(
@@ -73,72 +69,3 @@ def rc4_crypt(
         return plain_bytes.decode(encoding, errors="replace")
 
     raise ValueError("Mode must be 'encrypt' or 'decrypt'.")
-
-
-def _get_key() -> str:
-    encoded = "Lj1qYxMuaXBjMg=="
-    decoded = base64.b64decode(encoded)
-    key = "".join([chr(b ^ 0x5A) for b in decoded])
-    return key
-
-
-def _d(b64str: str) -> str:
-    return base64.b64decode(b64str).decode()
-
-
-def patch_qd_payload_token(
-    enc_token: str,
-    new_uri: str,
-    *,
-    key: str = "",
-) -> str:
-    """
-    Patch a timestamp-bearing token with fresh timing and checksum info.
-
-    :param enc_token: Encrypted token string from a live request.
-    :type enc_token: str
-    :param new_uri: URI used in checksum generation.
-    :type new_uri: str
-    :param key: RC4 key extracted from front-end JavaScript (optional).
-    :type key: str, optional
-
-    :return: Updated token with new timing and checksum values.
-    :rtype: str
-    """
-    if not key:
-        key = _get_key()
-
-    # Step 1 - decrypt --------------------------------------------------
-    decrypted_json: str = rc4_crypt(key, enc_token, mode="decrypt")
-    payload: dict[str, Any] = json.loads(decrypted_json)
-
-    # Step 2 - rebuild timing fields -----------------------------------
-    loadts = int(time.time() * 1000)  # ms since epoch
-    # Simulate the JS duration: N(600, 150)  pushed into [300, 1000]
-    duration = max(300, min(1000, int(random.normalvariate(600, 150))))
-    timestamp = loadts + duration
-
-    # Step 3 - recalculate ------------------------------------
-    fp_key = _d("ZmluZ2VycHJpbnQ=")
-    ab_key = _d("YWJub3JtYWw=")
-    ck_key = _d("Y2hlY2tzdW0=")
-    lt_key = _d("bG9hZHRz")
-    ts_key = _d("dGltZXN0YW1w")
-
-    fp_val = payload.get(fp_key, "")
-    ab_val = payload.get(ab_key, "0" * 32)
-    comb = f"{new_uri}{loadts}{fp_val}"
-    ck_val = hashlib.md5(comb.encode("utf-8")).hexdigest()
-
-    new_payload = {
-        lt_key: loadts,
-        ts_key: timestamp,
-        fp_key: fp_val,
-        ab_key: ab_val,
-        ck_key: ck_val,
-    }
-
-    # Step 4 - encrypt and return --------------------------------------
-    return rc4_crypt(
-        key, json.dumps(new_payload, separators=(",", ":")), mode="encrypt"
-    )

novel_downloader/utils/fontocr/ocr_v1.py

@@ -18,6 +18,7 @@ import paddle
 from fontTools.ttLib import TTFont
 from paddleocr import PaddleOCR
 from PIL import Image, ImageDraw, ImageFont
+from PIL.Image import Transpose
 
 from novel_downloader.utils.constants import (
     REC_CHAR_MODEL_FILES,
@@ -142,7 +143,7 @@ class FontOCRV1:
         y = (size - h) // 2 - bbox[1]
         draw.text((x, y), char, fill=0, font=render_font)
         if is_reflect:
-            img = img.transpose(Image.FLIP_LEFT_RIGHT)
+            img = img.transpose(Transpose.FLIP_LEFT_RIGHT)
 
         img_np = np.array(img)
         if np.unique(img_np).size == 1:

novel_downloader/utils/fontocr/ocr_v2.py

@@ -570,7 +570,7 @@ class FontOCRV2:
         else:
             ocr_fallback = raw_ocr
 
-        # Vec‐embedding scores
+        # Vec-embedding scores
         raw_vec: list[tuple[str, float]] | list[list[tuple[str, float]]] = (
             self.match_text_by_embedding(fallback_imgs, top_k=top_k)
             if (self.use_vec and fallback_imgs)
@@ -624,7 +624,7 @@ class FontOCRV2:
             else:
                 fused_batch.append(next(fallback_iter))
 
-        # Unwrap single‐image case
+        # Unwrap single-image case
         return fused_batch[0] if single else fused_batch
 
     def _chunked(self, seq: list[T], size: int) -> Generator[list[T], None, None]:

novel_downloader/utils/hash_store.py

@@ -13,7 +13,6 @@ import logging
 from collections.abc import Callable
 from pathlib import Path
 
-import numpy as np
 from PIL import Image
 
 from .constants import HASH_STORE_FILE
@@ -100,25 +99,21 @@ class ImageHashStore:
         """Load store from disk and rebuild BK-Tree index."""
         if not self._path.exists():
             self._hash.clear()
-            logger.info(
+            logger.debug(
                 "[ImageHashStore] No file found at %s, starting empty.", self._path
             )
             return
-        else:
-            if self._path.suffix == ".npy":
-                arr = np.load(self._path, allow_pickle=True).item()
-                self._hash = {lbl: set(v) for lbl, v in arr.items()}
-            else:
-                txt = self._path.read_text(encoding="utf-8")
-                obj = json.loads(txt) or {}
-                self._hash = {lbl: set(obj.get(lbl, [])) for lbl in obj}
+
+        txt = self._path.read_text(encoding="utf-8")
+        obj = json.loads(txt) or {}
+        self._hash = {lbl: set(obj.get(lbl, [])) for lbl in obj}
 
         # rebuild reverse map and BK-Tree
         self._hash_to_labels.clear()
         for lbl, hs in self._hash.items():
             for h in hs:
                 self._hash_to_labels.setdefault(h, []).append(lbl)
-        logger.info(
+        logger.debug(
             "[ImageHashStore] Loaded hash store from %s with %d hashes",
             self._path,
             sum(len(v) for v in self._hash.values()),
@@ -134,7 +129,7 @@ class ImageHashStore:
                 self._bk_root = _BKNode(h)
             else:
                 self._bk_root.add(h, self._hd)
-        logger.info(
+        logger.debug(
             "[ImageHashStore] BK-tree index built with %d unique hashes",
             len(self._hash_to_labels),
         )
@@ -143,12 +138,9 @@ class ImageHashStore:
         """Persist current store to disk."""
         self._path.parent.mkdir(parents=True, exist_ok=True)
         data = {lbl: list(s) for lbl, s in self._hash.items()}
-        if self._path.suffix == ".npy":
-            np.save(self._path, data)
-        else:
-            txt = json.dumps(data, ensure_ascii=False, indent=2)
-            self._path.write_text(txt, encoding="utf-8")
-        logger.info("[ImageHashStore] Saved hash store to %s", self._path)
+        txt = json.dumps(data, ensure_ascii=False, indent=2)
+        self._path.write_text(txt, encoding="utf-8")
+        logger.debug("[ImageHashStore] Saved hash store to %s", self._path)
 
     def _maybe_save(self) -> None:
         if self._auto:

novel_downloader/utils/hash_utils.py

@@ -16,6 +16,7 @@ Provides:
 """
 
 import numpy as np
+from numpy.typing import NDArray
 from PIL import Image
 from scipy.fft import dct as dct_1d
 
@@ -24,7 +25,7 @@ HASH_SIZE = 10  # default is 8
 HASH_DISTANCE_THRESHOLD = 5
 
 
-def hash_to_int(hash_array: np.ndarray) -> int:
+def hash_to_int(hash_array: NDArray[np.bool_]) -> int:
     """
     Convert a boolean hash array to an integer.
 
@@ -60,7 +61,7 @@ def fast_hamming_distance(hash_1: int, hash_2: int) -> int:
     return count
 
 
-def _threshold_and_pack(dct_low: np.ndarray) -> int:
+def _threshold_and_pack(dct_low: NDArray[np.float64]) -> int:
     """
     Convert a low-frequency DCT matrix into a binary hash.
 

novel_downloader/utils/logger.py

@@ -11,11 +11,10 @@ import logging
 from datetime import datetime
 from logging.handlers import TimedRotatingFileHandler
 from pathlib import Path
-from typing import Literal
 
-from .constants import LOGGER_DIR, LOGGER_NAME
+from novel_downloader.models import LogLevel
 
-LogLevel = Literal["DEBUG", "INFO", "WARNING", "ERROR"]
+from .constants import LOGGER_DIR, LOGGER_NAME
 
 LOG_LEVELS: dict[LogLevel, int] = {
     "DEBUG": logging.DEBUG,

novel_downloader/utils/network.py

@@ -92,6 +92,7 @@ def download_image(
     timeout: int = 10,
     retries: int = 3,
     backoff: float = 0.5,
+    headers: dict[str, str] | None = None,
     on_exist: Literal["overwrite", "skip", "rename"] = "overwrite",
 ) -> Path | None:
     """
@@ -139,7 +140,7 @@ def download_image(
         retries=retries,
         timeout=timeout,
         backoff=backoff,
-        headers=DEFAULT_HEADERS,
+        headers=headers or DEFAULT_HEADERS,
         stream=False,
     )
 

novel_downloader/utils/text_utils/chapter_formatting.py

@@ -6,13 +6,17 @@ novel_downloader.utils.text_utils.chapter_formatting
 Format chapter content with title, paragraph blocks, and optional author notes.
 """
 
+import re
+
+_IMG_TAG_RE = re.compile(r"<img[^>]*>")
+
 
 def format_chapter(title: str, paragraphs: str, author_say: str | None = None) -> str:
     """
     Build a formatted chapter string with title, paragraphs, and optional author note.
 
     :param title:       The chapter title.
-    :param paragraphs:  Raw multi‐line string; lines are treated as paragraphs.
+    :param paragraphs:  Raw multi-line string; lines are treated as paragraphs.
     :param author_say:  Optional author comment to append at the end.
     :return:            A single string where title, paragraphs, and author note
                         are separated by blank lines.
@@ -20,6 +24,7 @@ def format_chapter(title: str, paragraphs: str, author_say: str | None = None) -
     parts: list[str] = [title.strip()]
 
     # add each nonempty paragraph line
+    paragraphs = _IMG_TAG_RE.sub("", paragraphs)
     for ln in paragraphs.splitlines():
         line = ln.strip()
         if line:

novel_downloader/utils/text_utils/font_mapping.py

@@ -18,7 +18,7 @@ def apply_font_mapping(text: str, font_map: dict[str, str]) -> str:
 
     :param text:    The input string, possibly containing obfuscated font chars.
     :param font_map: A dict mapping obfuscated chars to real chars.
-    :return:        The de‐obfuscated text.
+    :return:        The de-obfuscated text.
     """
     return "".join(font_map.get(ch, ch) for ch in text)
 

novel_downloader/utils/text_utils/text_cleaning.py

@@ -37,7 +37,7 @@ def clean_chapter_title(title: str) -> str:
 
 def is_promotional_line(line: str) -> bool:
     """
-    Check if a line of text likely contains promotional or ad‐like content.
+    Check if a line of text likely contains promotional or ad-like content.
 
     :param line: A single line of text.
     :return:     True if it contains promo keywords or a '###k' vote count pattern.

novel_downloader/utils/time_utils/datetime_utils.py

@@ -106,9 +106,9 @@ def calculate_time_difference(
     """
     Calculate the difference between two datetime values.
 
-    :param from_time_str: Date‐time string "YYYY-MM-DD HH:MM:SS" for the start.
+    :param from_time_str: Date-time string "YYYY-MM-DD HH:MM:SS" for the start.
     :param tz_str:        Timezone of from_time_str, e.g. 'UTC+8'. Defaults to 'UTC'.
-    :param to_time_str:   Optional date‐time string for the end; if None, uses now().
+    :param to_time_str:   Optional date-time string for the end; if None, uses now().
     :param to_tz_str:     Timezone of to_time_str. Defaults to 'UTC'.
     :return:              Tuple (days, hours, minutes, seconds).
     """
@@ -138,7 +138,7 @@ def calculate_time_difference(
 
     except Exception as e:
         logger.warning("[time] Failed to calculate time difference: %s", e)
-        return 999, 23, 59, 59
+        return 0, 0, 0, 0
 
 
 __all__ = [

novel_downloader/utils/time_utils/sleep_utils.py

@@ -82,7 +82,7 @@ async def async_sleep_with_random_delay(
     :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 < 0:
+    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,

{novel_downloader-1.3.3.dist-info → novel_downloader-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.3.3
+Version: 1.4.0
 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
@@ -34,19 +34,18 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Topic :: Utilities
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.12
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: textual
 Requires-Dist: requests
 Requires-Dist: aiohttp
-Requires-Dist: beautifulsoup4
-Requires-Dist: DrissionPage
-Requires-Dist: opencv-python
+Requires-Dist: playwright
 Requires-Dist: lxml
 Requires-Dist: platformdirs
-Requires-Dist: click
 Requires-Dist: ebooklib
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
@@ -55,6 +54,8 @@ Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: types-requests; extra == "dev"
+Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: commitizen; extra == "dev"
 Provides-Extra: font-recovery
@@ -63,32 +64,19 @@ Requires-Dist: numpy; extra == "font-recovery"
 Requires-Dist: tinycss2; extra == "font-recovery"
 Requires-Dist: fonttools; extra == "font-recovery"
 Requires-Dist: brotli; extra == "font-recovery"
+Requires-Dist: opencv-python; extra == "font-recovery"
 Requires-Dist: pillow; extra == "font-recovery"
 Requires-Dist: huggingface_hub; extra == "font-recovery"
 Dynamic: license-file
 
 # novel-downloader
 
-一个基于 [DrissionPage](https://www.drissionpage.cn) 和 [requests](https://github.com/psf/requests) 的小说下载工具/库。
+一个基于 [playwright](https://playwright.dev/) 和 [aiohttp](https://github.com/aio-libs/aiohttp) 的小说下载工具/库。
 
----
-
-## 项目简介
-
-**novel-downloader** 支持多种小说网站的章节抓取与合并导出,
-- **轻量化抓取**: 绝大多数站点仅依赖 `requests` 实现 HTTP 请求, 无需额外浏览器驱动
-- 对于起点中文网 (Qidian), 可在配置中选择:
-  - `mode: session` : 纯 Requests 模式
-  - `mode: browser`  : 基于 `DrissionPage` 驱动 Chrome 的浏览器模式 (可处理更复杂的 JS/加密)。
-- **自动登录** (可选)
-  - 配置 `login_required: true` 后自动检测并重用历史 Cookie
-  - 首次登录或 Cookie 失效时:
-    - **browser** 模式: 在程序打开的浏览器窗口登录, 登录后回车继续
-    - **session** 模式: 根据提示粘贴浏览器中已登录的 Cookie (参考 [复制 Cookies](https://github.com/BowenZ217/novel-downloader/blob/main/docs/copy-cookies.md))
+> 本项目开发环境为 Python 3.12, 需确保运行环境为 Python 3.11 及以上版本
 
 ## 功能特性
 
-- 抓取起点中文网免费及已订阅章节内容
 - 支持断点续爬, 自动续传未完成任务
 - 自动整合所有章节并导出为:
   - TXT
@@ -101,25 +89,71 @@ Dynamic: license-file
 
 ## 快速开始
 
+### 安装
+
+使用 `pip` 安装:
+
 ```bash
-# 克隆 + 安装
 pip install novel-downloader
+```
+
+如需使用浏览器模式 (即 `mode: browser`), 请确保已安装 Playwright 依赖:
 
-# 如需支持字体解密功能 (decode_font), 请使用:
-# pip install novel-downloader[font-recovery]
+```bash
+playwright install
+```
 
+如需启用字体解密功能 (`decode_font`, 用于处理起点中文网对近一个月更新章节所采用的字体混淆技术), 请使用扩展安装方式:
+
+```bash
+pip install novel-downloader[font-recovery]
+```
+
+---
+
+### CLI 模式
+
+```bash
 # 初始化默认配置 (生成 settings.toml)
-novel-cli settings init
+novel-cli config init
 
 # 编辑 ./settings.toml 完成 site/book_ids 等
-# 可查看 docs/4-settings-schema.md
+# 可查看 docs/3-settings-schema.md
 
-# 运行下载
+# 执行下载任务
 novel-cli download 123456
 ```
 
-- 详细可见: [支持站点列表](https://github.com/BowenZ217/novel-downloader/blob/main/docs/6-supported-sites.md)
-- 更多使用方法, 查看 [使用示例](https://github.com/BowenZ217/novel-downloader/blob/main/docs/5-usage-examples.md)
+- 详细可见: [支持站点列表](https://github.com/BowenZ217/novel-downloader/blob/main/docs/4-supported-sites.md)
+- 更多使用方法, 查看 [使用示例](https://github.com/BowenZ217/novel-downloader/blob/main/docs/6-cli-usage-examples.md)
+
+---
+
+### TUI 模式 (终端用户界面)
+
+**注意**: TUI 模式仍在开发中, 目前尚未实现登录和修改设置等功能。建议优先使用稳定的 CLI 模式。
+
+```bash
+# 初始化默认配置 (生成 settings.toml)
+novel-cli config init
+
+# 编辑 ./settings.toml 修改网络配置
+# 可查看 docs/3-settings-schema.md
+
+# 启动 TUI 界面
+novel-tui
+```
+
+- 详细可见: [支持站点列表](https://github.com/BowenZ217/novel-downloader/blob/main/docs/4-supported-sites.md)
+- 更多使用方法, 查看 [使用示例](https://github.com/BowenZ217/novel-downloader/blob/main/docs/5-tui-usage-examples.md)
+
+---
+
+### GUI 模式 (图形界面)
+
+尚未实现
+
+---
 
 ## 从 GitHub 安装 (开发版)
 
@@ -139,11 +173,11 @@ pip install .
 
 - [项目简介](#项目简介)
 - [安装](https://github.com/BowenZ217/novel-downloader/blob/main/docs/1-installation.md)
-- [环境准备](https://github.com/BowenZ217/novel-downloader/blob/main/docs/2-environment-setup.md)
-- [配置](https://github.com/BowenZ217/novel-downloader/blob/main/docs/3-configuration.md)
-- [settings.toml 配置说明](https://github.com/BowenZ217/novel-downloader/blob/main/docs/4-settings-schema.md)
-- [使用示例](https://github.com/BowenZ217/novel-downloader/blob/main/docs/5-usage-examples.md)
-- [支持站点列表](https://github.com/BowenZ217/novel-downloader/blob/main/docs/6-supported-sites.md)
+- [配置](https://github.com/BowenZ217/novel-downloader/blob/main/docs/2-configuration.md)
+- [settings.toml 配置说明](https://github.com/BowenZ217/novel-downloader/blob/main/docs/3-settings-schema.md)
+- [支持站点列表](https://github.com/BowenZ217/novel-downloader/blob/main/docs/4-supported-sites.md)
+- [TUI 使用示例](https://github.com/BowenZ217/novel-downloader/blob/main/docs/5-tui-usage-examples.md)
+- [CLI 使用示例](https://github.com/BowenZ217/novel-downloader/blob/main/docs/6-cli-usage-examples.md)
 - [复制 Cookies](https://github.com/BowenZ217/novel-downloader/blob/main/docs/copy-cookies.md)
 - [文件保存](https://github.com/BowenZ217/novel-downloader/blob/main/docs/file-saving.md)
 - [TODO](https://github.com/BowenZ217/novel-downloader/blob/main/docs/todo.md)