novel-downloader 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

novel_downloader/__init__.py

@@ -7,7 +7,7 @@ novel_downloader
 Core package for the Novel Downloader project.
 """
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 __author__ = "Saudade Z"
 __email__ = "saudadez217@gmail.com"

novel_downloader/cli/download.py

@@ -57,6 +57,8 @@ def download_cli(ctx: Context, book_ids: List[str], site: str) -> None:
     parser_cfg = adapter.get_parser_config()
     saver_cfg = adapter.get_saver_config()
 
+    click.echo(t("download_site_mode", mode=downloader_cfg.mode))
+
     # If no book_ids provided on the command line, try to load them from config
     if not book_ids:
         try:

novel_downloader/config/adapter.py

@@ -23,6 +23,7 @@ from .models import (
     RequesterConfig,
     SaverConfig,
 )
+from .site_rules import load_site_rules
 
 
 class ConfigAdapter:
@@ -38,19 +39,43 @@ class ConfigAdapter:
         self._config = config
         self._site = site
 
+        site_rules = load_site_rules()  # -> Dict[str, SiteRules]
+        self._supported_sites = set(site_rules.keys())
+
     def set_site(self, site: str) -> None:
         """
         切换当前适配的站点
         """
         self._site = site
 
+    def _get_site_cfg(self) -> Dict[str, Any]:
+        """
+        统一获取站点配置:
+
+        1. 先尝试从 self._config["sites"][self._site] 取配置
+        2. 如果没有配置, 且 self._site 在 self._supported_sites 中, 则取 sites["common"]
+        3. 否则返回空 dict
+        """
+        sites_cfg = self._config.get("sites", {}) or {}
+
+        # 1. site-specific config
+        if self._site in sites_cfg:
+            return sites_cfg[self._site] or {}
+
+        # 2. fallback to "common" only if site is supported
+        if self._site in self._supported_sites:
+            return sites_cfg.get("common", {}) or {}
+
+        # 3. completely unsupported site
+        return {}
+
     def get_requester_config(self) -> RequesterConfig:
         """
         从 config["requests"] 中读取通用请求配置 (含 DrissionPage 设置)
         返回 RequesterConfig 实例
         """
         req = self._config.get("requests", {})
-        site_cfg = self._config.get("sites", {}).get(self._site, {})
+        site_cfg = self._get_site_cfg()
         return RequesterConfig(
             wait_time=req.get("wait_time", 5),
             retry_times=req.get("retry_times", 3),
@@ -73,7 +98,7 @@ class ConfigAdapter:
         """
         gen = self._config.get("general", {})
         debug = gen.get("debug", {})
-        site_cfg = self._config.get("sites", {}).get(self._site, {})
+        site_cfg = self._get_site_cfg()
         return DownloaderConfig(
             request_interval=gen.get("request_interval", 5),
             raw_data_dir=gen.get("raw_data_dir", "./raw_data"),
@@ -94,7 +119,7 @@ class ConfigAdapter:
         """
         gen = self._config.get("general", {})
         font_ocr = gen.get("font_ocr", {})
-        site_cfg = self._config.get("sites", {}).get(self._site, {})
+        site_cfg = self._get_site_cfg()
         return ParserConfig(
             cache_dir=gen.get("cache_dir", "./cache"),
             decode_font=font_ocr.get("decode_font", False),
@@ -139,7 +164,7 @@ class ConfigAdapter:
         """
         从 config["sites"][site]["book_ids"] 中提取目标书籍列表
         """
-        site_cfg = self._config.get("sites", {}).get(self._site, {})
+        site_cfg = self._get_site_cfg()
         raw_ids = site_cfg.get("book_ids", [])
 
         if isinstance(raw_ids, str):

novel_downloader/config/models.py

@@ -135,16 +135,19 @@ class ChapterFieldRules(TypedDict):
     steps: List[RuleStep]
 
 
-class VolumesRules(TypedDict, total=False):
-    has_volume: bool  # 是否存在卷，false=未分卷
+class VolumesRulesOptional(TypedDict, total=False):
     volume_selector: str  # 有卷时选择 volume 块的 selector
-    chapter_selector: str  # 选择 chapter 节点的 selector
     volume_name_steps: List[RuleStep]
-    chapter_steps: List[ChapterFieldRules]  # 提取章节信息的步骤列表
     volume_mode: str  # Optional: "normal" (default) or "mixed"
     list_selector: str  # Optional: If "mixed" mode, parent container selector
 
 
+class VolumesRules(VolumesRulesOptional):
+    has_volume: bool  # 是否存在卷，false=未分卷
+    chapter_selector: str  # 选择 chapter 节点的 selector
+    chapter_steps: List[ChapterFieldRules]  # 提取章节信息的步骤列表
+
+
 class BookInfoRules(TypedDict, total=False):
     book_name: FieldRules
     author: FieldRules

novel_downloader/core/downloaders/common_downloader.py

@@ -67,8 +67,7 @@ class CommonDownloader(BaseDownloader):
         cache_base = self.cache_dir / site / book_id
         info_path = raw_base / "book_info.json"
         chapter_dir = raw_base / "chapters"
-        if save_html:
-            chapters_html_dir = cache_base / "html"
+        chapters_html_dir = cache_base / "html"
 
         raw_base.mkdir(parents=True, exist_ok=True)
         chapter_dir.mkdir(parents=True, exist_ok=True)

novel_downloader/core/downloaders/qidian_downloader.py

@@ -87,8 +87,7 @@ class QidianDownloader(BaseDownloader):
         info_path = raw_base / "book_info.json"
         chapter_dir = raw_base / "chapters"
         encrypted_chapter_dir = raw_base / "encrypted_chapters"
-        if save_html:
-            chapters_html_dir = cache_base / "html"
+        chapters_html_dir = cache_base / "html"
 
         raw_base.mkdir(parents=True, exist_ok=True)
         chapter_dir.mkdir(parents=True, exist_ok=True)

novel_downloader/core/factory/downloader_factory.py

@@ -14,7 +14,7 @@ based on the site name and parser mode specified in the configuration.
 To add support for new sites or modes, extend the `_site_map` accordingly.
 """
 
-from typing import Union
+from typing import Union, cast
 
 from novel_downloader.config import DownloaderConfig, load_site_rules
 from novel_downloader.core.downloaders import (
@@ -137,13 +137,15 @@ def get_downloader(
     :raises TypeError: If the provided requester does not match the required protocol
                     for the chosen mode (sync vs async).
     """
-    mode = config.mode.lower()
-    if mode == "async":
-        if not isinstance(requester, AsyncRequesterProtocol):
-            raise TypeError("Async mode requires an AsyncRequesterProtocol")
-        return get_async_downloader(requester, parser, saver, site, config)
-    if mode in ("browser", "session"):
-        if not isinstance(requester, RequesterProtocol):
-            raise TypeError("Sync mode requires a RequesterProtocol")
-        return get_sync_downloader(requester, parser, saver, site, config)
-    raise ValueError(f"Unknown mode '{config.mode}' for site '{site}'")
+    if requester.is_async():
+        if config.mode.lower() != "async":
+            raise TypeError("Requester is async, but config.mode is not 'async'")
+        async_requester = cast(AsyncRequesterProtocol, requester)
+        return get_async_downloader(async_requester, parser, saver, site, config)
+    else:
+        if config.mode.lower() not in ("browser", "session"):
+            raise TypeError(
+                "Requester is sync, but config.mode is not 'browser' or 'session'"
+            )
+        sync_requester = cast(RequesterProtocol, requester)
+        return get_sync_downloader(sync_requester, parser, saver, site, config)

novel_downloader/core/interfaces/async_requester_protocol.py

@@ -9,7 +9,7 @@ for book info pages, individual chapters, managing request lifecycle,
 and optionally retrieving a user's authenticated bookcase — all in async style.
 """
 
-from typing import Optional, Protocol, runtime_checkable
+from typing import Literal, Optional, Protocol, runtime_checkable
 
 
 @runtime_checkable
@@ -21,6 +21,9 @@ class AsyncRequesterProtocol(Protocol):
     and manage login/shutdown asynchronously.
     """
 
+    def is_async(self) -> Literal[True]:
+        ...
+
     async def login(self, max_retries: int = 3, manual_login: bool = False) -> bool:
         """
         Attempt to log in asynchronously.

novel_downloader/core/interfaces/requester_protocol.py

@@ -9,7 +9,7 @@ for book info pages, individual chapters, managing request lifecycle,
 and optionally retrieving a user's authenticated bookcase.
 """
 
-from typing import Optional, Protocol, runtime_checkable
+from typing import Literal, Optional, Protocol, runtime_checkable
 
 
 @runtime_checkable
@@ -20,6 +20,9 @@ class RequesterProtocol(Protocol):
       - a specific chapter page.
     """
 
+    def is_async(self) -> Literal[False]:
+        ...
+
     def login(self, max_retries: int = 3, manual_login: bool = False) -> bool:
         """
         Attempt to log in

novel_downloader/core/parsers/base_parser.py

@@ -45,14 +45,14 @@ class BaseParser(ParserProtocol, abc.ABC):
         self._base_cache_dir = Path(config.cache_dir)
 
     @abc.abstractmethod
-    def parse_book_info(self, html: str) -> Dict[str, Any]:
+    def parse_book_info(self, html_str: str) -> Dict[str, Any]:
         """
         Parse a book info page and extract metadata and chapter structure.
 
         Depending on the site structure, the return dict may include a
         flat `chapters` list or nested `volumes` with chapter groups.
 
-        :param html: Raw HTML of the book info page.
+        :param html_str: Raw HTML of the book info page.
         :return: Parsed metadata and chapter structure as a dictionary.
         """
         ...
@@ -62,7 +62,7 @@ class BaseParser(ParserProtocol, abc.ABC):
         """
         Parse a single chapter page and extract clean text or simplified HTML.
 
-        :param html: Raw HTML of the chapter page.
+        :param html_str: Raw HTML of the chapter page.
         :param chapter_id: Identifier of the chapter being parsed.
         :return: Cleaned chapter content as plain text or minimal HTML.
         """

novel_downloader/core/parsers/common_parser/helper.py

@@ -188,7 +188,7 @@ class HTMLExtractor:
                     current = sep.join(current)
 
             elif t == "attr":
-                name = step.get("attr")
+                name = step.get("attr") or ""
                 if isinstance(current, list):
                     current = [elem.get(name, "") for elem in current]
                 elif isinstance(current, Tag):
@@ -216,9 +216,9 @@ class HTMLExtractor:
         """
         list_selector = volume_rule.get("list_selector")
         volume_selector = volume_rule.get("volume_selector")
-        chapter_selector = volume_rule.get("chapter_selector")
         volume_name_steps = volume_rule.get("volume_name_steps")
-        chapter_steps_list = volume_rule.get("chapter_steps")
+        chapter_selector = volume_rule["chapter_selector"]
+        chapter_steps_list = volume_rule["chapter_steps"]
 
         if not (
             list_selector and volume_selector and chapter_selector and volume_name_steps
@@ -241,6 +241,8 @@ class HTMLExtractor:
         for elem in list_area.find_all(
             [volume_selector, chapter_selector], recursive=True
         ):
+            if not isinstance(elem, Tag):
+                continue
             if elem.name == volume_selector:
                 extractor = HTMLExtractor(str(elem))
                 volume_name = extractor.extract_field(volume_name_steps)
@@ -257,9 +259,9 @@ class HTMLExtractor:
         return volumes
 
     def extract_volume_blocks(self, volume_rule: VolumesRules) -> List[Dict[str, Any]]:
-        volume_selector = volume_rule["volume_selector"]
+        volume_selector = volume_rule.get("volume_selector")
+        volume_name_steps = volume_rule.get("volume_name_steps")
         chapter_selector = volume_rule["chapter_selector"]
-        volume_name_steps = volume_rule["volume_name_steps"]
         chapter_steps_list = volume_rule["chapter_steps"]
         if not (volume_selector and volume_name_steps):
             raise ValueError(

novel_downloader/core/parsers/qidian_parser/browser/chapter_encrypted.py

@@ -229,7 +229,7 @@ def extract_paragraphs_recursively(
     if chapter_id:
         main_id = f"c-{chapter_id}"
         main_tag = soup.find("main", id=main_id)
-        if not main_tag:
+        if not isinstance(main_tag, Tag):
             return []
     else:
         main_tag = soup

novel_downloader/core/parsers/qidian_parser/browser/main_parser.py

@@ -69,14 +69,14 @@ class QidianBrowserParser(BaseParser):
             self._font_debug_dir = self._base_cache_dir / "font_debug"
             self._font_debug_dir.mkdir(parents=True, exist_ok=True)
 
-    def parse_book_info(self, html: str) -> Dict[str, Any]:
+    def parse_book_info(self, html_str: str) -> Dict[str, Any]:
         """
         Parse a book info page and extract metadata and chapter structure.
 
-        :param html: Raw HTML of the book info page.
+        :param html_str: Raw HTML of the book info page.
         :return: Parsed metadata and chapter structure as a dictionary.
         """
-        return parse_book_info(html)
+        return parse_book_info(html_str)
 
     def parse_chapter(self, html_str: str, chapter_id: str) -> Dict[str, Any]:
         """

novel_downloader/core/parsers/qidian_parser/session/chapter_encrypted.py

@@ -245,7 +245,7 @@ def extract_paragraphs_recursively(
     if chapter_id > 0:
         main_id = f"c-{chapter_id}"
         main_tag = soup.find("main", id=main_id)
-        if not main_tag:
+        if not isinstance(main_tag, Tag):
             return []
     else:
         main_tag = soup

novel_downloader/core/parsers/qidian_parser/session/main_parser.py

@@ -72,14 +72,14 @@ class QidianSessionParser(BaseParser):
             self._font_debug_dir = self._base_cache_dir / "font_debug"
             self._font_debug_dir.mkdir(parents=True, exist_ok=True)
 
-    def parse_book_info(self, html: str) -> Dict[str, Any]:
+    def parse_book_info(self, html_str: str) -> Dict[str, Any]:
         """
         Parse a book info page and extract metadata and chapter structure.
 
-        :param html: Raw HTML of the book info page.
+        :param html_str: Raw HTML of the book info page.
         :return: Parsed metadata and chapter structure as a dictionary.
         """
-        return parse_book_info(html)
+        return parse_book_info(html_str)
 
     def parse_chapter(self, html_str: str, chapter_id: str) -> Dict[str, Any]:
         """

novel_downloader/core/parsers/qidian_parser/shared/book_info_parser.py

@@ -41,6 +41,58 @@ def _get_volume_name(vol_div: Tag) -> str:
     return text.split(chr(183))[0].strip()
 
 
+def safe_select_text(
+    soup: Tag,
+    selector: str,
+    *,
+    separator: str = "",
+    strip: bool = False,
+    default: str = "",
+) -> str:
+    """
+    Safely select the first element matching a CSS selector and return its text.
+
+    :param soup: A BeautifulSoup Tag or sub-tree to query.
+    :param selector: A CSS selector string.
+    :param separator: Separator to use between strings when joining.
+    :param strip: Whether to strip whitespace from the result.
+    :param default: Value to return if no element is found.
+    :return: The element's text, or `default` if not found.
+    """
+    tag = soup.select_one(selector)
+    return (
+        tag.get_text(separator=separator, strip=strip)
+        if isinstance(tag, Tag)
+        else default
+    )
+
+
+def safe_select_attr(
+    soup: Tag,
+    selector: str,
+    attr: str,
+    *,
+    default: str = "",
+) -> str:
+    """
+    Safely select the first element matching a CSS selector and return one attributes.
+
+    :param soup: A BeautifulSoup Tag or sub-tree to query.
+    :param selector: A CSS selector string.
+    :param attr: The attribute name to retrieve from the selected element.
+    :param default: Value to return if no element or attribute is found.
+    :return: The attribute's value stripped of whitespace, or `default` if not found.
+    """
+    tag = soup.select_one(selector)
+    if isinstance(tag, Tag) and attr in tag.attrs:
+        value = tag.attrs[attr]
+        if isinstance(value, list):
+            return " ".join(value).strip()
+        elif isinstance(value, str):
+            return value.strip()
+    return default
+
+
 def parse_book_info(html_str: str) -> Dict[str, Any]:
     """
     Extract metadata: title, author, cover_url, update_time, status,
@@ -52,27 +104,24 @@ def parse_book_info(html_str: str) -> Dict[str, Any]:
     info: Dict[str, Any] = {}
     try:
         soup = html_to_soup(html_str)
-        info["book_name"] = soup.select_one("em#bookName").get_text(strip=True)
-        info["author"] = soup.select_one("a.writer").get_text(strip=True)
-        info["cover_url"] = soup.select_one("div.book-img img")["src"].strip()
+        info["book_name"] = safe_select_text(soup, "em#bookName", strip=True)
+        info["author"] = safe_select_text(soup, "a.writer", strip=True)
+        info["cover_url"] = safe_select_attr(soup, "div.book-img img", "src")
         info["update_time"] = (
-            soup.select_one("span.book-update-time")
-            .get_text(strip=True)
+            safe_select_text(soup, "span.book-update-time", strip=True)
             .replace("更新时间", "")
             .strip()
         )
-        info["serial_status"] = soup.select_one("span.blue").get_text(strip=True)
-        # word count via regex
-        match = re.search(
-            r"<em>([\d.]+)</em>\s*<cite>(.*?)字</cite>",
-            html_str,
+        info["serial_status"] = safe_select_text(soup, "span.blue", strip=True)
+
+        # Word count via regex fallback
+        match = re.search(r"<em>([\d.]+)</em>\s*<cite>(.*?)字</cite>", html_str)
+        info["word_count"] = (
+            f"{match.group(1)}{match.group(2)}字" if match else "Unknown"
         )
-        if match:
-            info["word_count"] = match.group(1) + match.group(2) + "字"
-        else:
-            info["word_count"] = "Unknown"
-        info["summary"] = soup.select_one("div.book-intro p").get_text(
-            separator="\n", strip=True
+
+        info["summary"] = safe_select_text(
+            soup, "div.book-intro p", separator="\n", strip=True
         )
         # volumes
         vols = []
@@ -81,11 +130,18 @@ def parse_book_info(html_str: str) -> Dict[str, Any]:
             chaps = []
             for li in vol_div.select("li"):
                 a = li.select_one("a")
+                if not isinstance(a, Tag) or "href" not in a.attrs:
+                    continue
+                href_val = a["href"]
+                if isinstance(href_val, list):
+                    href = href_val[0].strip()
+                else:
+                    href = str(href_val).strip()
                 chaps.append(
                     {
                         "title": a.get_text(strip=True),
-                        "url": a["href"].strip(),
-                        "chapterId": _chapter_url_to_id(a["href"]),
+                        "url": href,
+                        "chapterId": _chapter_url_to_id(href),
                     }
                 )
             vols.append({"volume_name": name, "chapters": chaps})

novel_downloader/core/parsers/qidian_parser/shared/helpers.py

@@ -16,7 +16,7 @@ import json
 import logging
 from typing import Any, Dict, Union
 
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, Tag
 
 logger = logging.getLogger(__name__)
 
@@ -103,7 +103,7 @@ def find_ssr_page_context(soup: BeautifulSoup) -> Dict[str, Any]:
     """
     try:
         tag = soup.find("script", id="vite-plugin-ssr_pageContext")
-        if tag and tag.string:
+        if isinstance(tag, Tag) and tag.string:
             data: Dict[str, Any] = json.loads(tag.string.strip())
             return data
     except Exception as e:

novel_downloader/core/requesters/base_async_session.py

@@ -13,7 +13,7 @@ cookie handling, and defines abstract methods for subclasses.
 import abc
 import asyncio
 import time
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Literal, Optional, Union
 
 import aiohttp
 from aiohttp import ClientResponse, ClientSession, ClientTimeout, TCPConnector
@@ -58,6 +58,9 @@ class BaseAsyncSession(AsyncRequesterProtocol, abc.ABC):
         _cookies (Dict[str, str]): Optional cookie jar for the session.
     """
 
+    def is_async(self) -> Literal[True]:
+        return True
+
     def _init_session(
         self,
         config: RequesterConfig,

novel_downloader/core/requesters/base_browser.py

@@ -11,9 +11,10 @@ specialized purposes.
 
 import abc
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Literal, Optional, cast
 
-from DrissionPage import Chromium, ChromiumOptions, ChromiumPage
+from DrissionPage import Chromium, ChromiumOptions
+from DrissionPage._pages.mix_tab import MixTab
 
 from novel_downloader.config.models import RequesterConfig
 from novel_downloader.core.interfaces import RequesterProtocol
@@ -42,6 +43,9 @@ class BaseBrowser(RequesterProtocol, abc.ABC):
         _page (ChromiumPage): The active browser tab.
     """
 
+    def is_async(self) -> Literal[False]:
+        return False
+
     def _init_browser(self, config: RequesterConfig) -> None:
         """
         Initialize the browser with specified options from RequesterConfig.
@@ -99,7 +103,7 @@ class BaseBrowser(RequesterProtocol, abc.ABC):
         Set up the browser instance and open the default tab.
         """
         self._browser = Chromium(self._options)
-        self._page = self._browser.get_tab()
+        self._page = cast(MixTab, self._browser.get_tab())
 
     def login(self, max_retries: int = 3, manual_login: bool = False) -> bool:
         """
@@ -151,7 +155,7 @@ class BaseBrowser(RequesterProtocol, abc.ABC):
         )
 
     @property
-    def page(self) -> ChromiumPage:
+    def page(self) -> Optional[MixTab]:
         """
         Return the current Chromium page object.
 
@@ -160,7 +164,7 @@ class BaseBrowser(RequesterProtocol, abc.ABC):
         return self._page
 
     @property
-    def browser(self) -> Chromium:
+    def browser(self) -> Optional[Chromium]:
         """
         Return the Chromium browser instance.
 

novel_downloader/core/requesters/base_session.py

@@ -10,7 +10,7 @@ persistent session and supports retries, headers, and timeout configurations.
 """
 
 import abc
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Literal, Optional, Union
 
 import requests
 from requests import Response, Session
@@ -31,6 +31,9 @@ class BaseSession(RequesterProtocol, abc.ABC):
         _timeout (float): Timeout for each request in seconds.
     """
 
+    def is_async(self) -> Literal[False]:
+        return False
+
     def _init_session(
         self, config: RequesterConfig, cookies: Optional[Dict[str, str]] = None
     ) -> None:

novel_downloader/core/requesters/common_requester/common_session.py

@@ -64,7 +64,7 @@ class CommonSession(BaseSession):
                 with self.session.get(url, timeout=self.timeout) as response:
                     response.raise_for_status()
                     content = response.text
-                sleep_with_random_delay(base)
+                sleep_with_random_delay(base, add_spread=1.0)
                 return content
             except Exception as e:
                 if attempt == self.retry_times:
@@ -94,7 +94,7 @@ class CommonSession(BaseSession):
                 with self.session.get(url, timeout=self.timeout) as response:
                     response.raise_for_status()
                     content = response.text
-                sleep_with_random_delay(base)
+                sleep_with_random_delay(base, add_spread=1.0)
                 return content
             except Exception as e:
                 if attempt == self.retry_times:

novel_downloader/core/requesters/qidian_requester/qidian_broswer.py

@@ -15,10 +15,12 @@ import random
 import time
 from typing import Optional
 
+from DrissionPage._elements.chromium_element import ChromiumElement
 from DrissionPage.common import Keys
 
 from novel_downloader.config.models import RequesterConfig
 from novel_downloader.core.requesters.base_browser import BaseBrowser
+from novel_downloader.utils.i18n import t
 from novel_downloader.utils.time_utils import sleep_with_random_delay
 
 logger = logging.getLogger(__name__)
@@ -56,6 +58,8 @@ class QidianBrowser(BaseBrowser):
 
         :return: True if the user appears to be logged in, False otherwise.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         try:
             self._handle_overlay_mask()
             sign_in_elem = self._page.ele("@class=sign-in")
@@ -83,6 +87,8 @@ class QidianBrowser(BaseBrowser):
         :param max_retries: Maximum number of times to try clicking the login button.
         :return: True if login succeeds or is already in place; False otherwise.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         original_url = self._page.url
         try:
             self._page.get("https://www.qidian.com/")
@@ -107,7 +113,8 @@ class QidianBrowser(BaseBrowser):
 
         # return to original page
         try:
-            self._page.get(original_url)
+            if original_url:
+                self._page.get(original_url)
         except Exception as e:
             logger.debug("[auth] Failed to restore page URL: %s", e)
 
@@ -117,6 +124,8 @@ class QidianBrowser(BaseBrowser):
         """
         Detect and close any full-page overlay mask that might block the login UI.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         try:
             mask = self._page.ele("@@tag()=div@@class=mask", timeout=2)
             if not mask:
@@ -143,10 +152,12 @@ class QidianBrowser(BaseBrowser):
 
         :param attempt: The current attempt number (for logging).
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         try:
             logger.debug("[auth] Attempting login click (#%s).", attempt)
             login_btn = self._page.ele("@id=login-btn", timeout=5)
-            if login_btn:
+            if isinstance(login_btn, ChromiumElement):
                 login_btn.click()
                 logger.debug("[auth] Login button clicked.")
             else:
@@ -170,6 +181,8 @@ class QidianBrowser(BaseBrowser):
         :param max_retries: Number of times to check for login success.
         :return: True if login was detected, False otherwise.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         original_headless = self._headless
 
         # 1. Switch to headful mode if needed
@@ -193,13 +206,11 @@ class QidianBrowser(BaseBrowser):
                 logger.info("[auth] Detected successful login.")
                 self._logged_in = True
                 break
-
-            logger.info(
-                "[auth] Attempt %d/%d: Press Enter after completing login...",
-                attempt,
-                max_retries,
+            if attempt == 1:
+                print(t("login_prompt_intro"))
+            input(
+                t("login_prompt_press_enter", attempt=attempt, max_retries=max_retries)
             )
-            input()
         else:
             logger.warning("[auth] Manual login failed after %d attempts.", max_retries)
             self._logged_in = False
@@ -279,14 +290,16 @@ class QidianBrowser(BaseBrowser):
                           If None, uses `self._config.wait_time`.
         :return: The HTML content of the book info page, or an empty string on error.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         url = self._build_book_info_url(book_id)
         try:
             # Navigate and fetch
             self._page.get(url)
 
-            # Randomized human‑like delay
+            # Randomized human-like delay
             base = wait_time if wait_time is not None else self._config.wait_time
-            sleep_with_random_delay(base, base * 0.2)
+            sleep_with_random_delay(base, mul_spread=1.2)
 
             html = str(self._page.html)
             logger.debug("[fetch] Fetched book info for ID %s from %s", book_id, url)
@@ -303,6 +316,8 @@ class QidianBrowser(BaseBrowser):
         :param presses: Number of DOWN key presses.
         :param pause: Seconds to wait between each press.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         for _ in range(presses):
             try:
                 self._page.actions.key_down(Keys.DOWN)
@@ -318,7 +333,7 @@ class QidianBrowser(BaseBrowser):
 
         Ensures the user is logged in, navigates to the chapter page,
         waits a randomized delay to mimic human reading, then scrolls
-        to trigger any lazy‑loaded content.
+        to trigger any lazy-loaded content.
 
         :param book_id: The identifier of the book.
         :param chapter_id: The identifier of the chapter.
@@ -326,14 +341,16 @@ class QidianBrowser(BaseBrowser):
                           falls back to `self._config.wait_time`.
         :return: The HTML content of the chapter page, or empty string on error.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         url = self._build_chapter_url(book_id, chapter_id)
         try:
             # 1. Navigate to chapter URL
             self._page.get(url)
 
-            # 2. Randomized human‑like delay
+            # 2. Randomized human-like delay
             base = wait_time if wait_time is not None else self._config.wait_time
-            # sleep_with_random_delay(base, base*0.2)
+            # sleep_with_random_delay(base, mul_spread=1.2)
 
             # 3. Scroll down to load dynamic content
             presses = int(random.uniform(base, base + 5) * 2)
@@ -349,13 +366,15 @@ class QidianBrowser(BaseBrowser):
 
     def get_bookcase(self, wait_time: Optional[float] = None) -> str:
         """
-        Retrieve the HTML content of the logged‑in user's Qidian bookcase page.
+        Retrieve the HTML content of the logged-in user's Qidian bookcase page.
 
         :param wait_time: Base number of seconds to wait before returning content.
                           If None, falls back to `self._config.wait_time`.
         :return: The HTML markup of the bookcase page, or empty string on error.
         :raises RuntimeError: If the user is not logged in.
         """
+        if self._page is None:
+            raise RuntimeError("Browser page not initialized.")
         if not self._logged_in:
             raise RuntimeError("User not logged in. Please call login() first.")
 
@@ -364,9 +383,9 @@ class QidianBrowser(BaseBrowser):
             # Navigate to the bookcase page
             self._page.get(url)
 
-            # Randomized human‑like delay
+            # Randomized human-like delay
             base = wait_time if wait_time is not None else self._config.wait_time
-            sleep_with_random_delay(base, base * 0.2)
+            sleep_with_random_delay(base, mul_spread=1.2)
 
             html = str(self._page.html)
             logger.debug("[fetch] Fetched bookcase HTML from %s", url)

novel_downloader/core/requesters/qidian_requester/qidian_session.py

@@ -123,7 +123,7 @@ class QidianSession(BaseSession):
             try:
                 resp = self.get(url)
                 resp.raise_for_status()
-                sleep_with_random_delay(base_delay, base_delay * 0.2)
+                sleep_with_random_delay(base_delay, mul_spread=1.2)
                 return resp.text
             except Exception as exc:
                 logger.warning(
@@ -157,7 +157,7 @@ class QidianSession(BaseSession):
             try:
                 resp = self.get(url)
                 resp.raise_for_status()
-                sleep_with_random_delay(base_delay, base_delay * 0.2)
+                sleep_with_random_delay(base_delay, mul_spread=1.2)
                 return resp.text
             except Exception as exc:
                 logger.warning(
@@ -186,7 +186,7 @@ class QidianSession(BaseSession):
             try:
                 resp = self.get(self.QIDIAN_BOOKCASE_URL, allow_redirects=True)
                 resp.raise_for_status()
-                sleep_with_random_delay(base_delay, base_delay * 0.2)
+                sleep_with_random_delay(base_delay, mul_spread=1.2)
                 return resp.text
             except Exception as exc:
                 logger.warning(

novel_downloader/core/savers/common_saver/common_epub.py

@@ -212,7 +212,7 @@ def common_save_as_epub(
 
     # --- 5. Finalize EPUB ---
     logger.info("%s Building TOC and spine...", TAG)
-    book.toc = tuple(toc_list)
+    book.toc = toc_list
     book.spine = spine
     book.add_item(epub.EpubNcx())
     book.add_item(epub.EpubNav())

novel_downloader/locales/en.json

@@ -58,6 +58,7 @@
   "download_option_site": "Website source, default is '{default}'.",
   "download_using_config": "Using config: {path}",
   "download_site_info": "Site: {site}",
+  "download_site_mode": "Mode: {mode}",
   "download_no_ids": "No book IDs provided. Exiting.",
   "download_fail_get_ids": "Failed to get book IDs from config: {err}",
   "download_only_example": "Only example book IDs found (e.g. '{example}').",
@@ -65,6 +66,9 @@
   "download_downloading": "Downloading book {book_id} from {site}...",
   "download_prompt_parse": "Parse...",
 
+  "login_prompt_intro": "Manual login is required. Please switch to the browser and log in.",
+  "login_prompt_press_enter": "Attempt {attempt}/{max_retries}: Press Enter after completing login in the browser...",
+
   "clean_logs": "Clean log directory",
   "clean_cache": "Clean scripts and browser cache",
   "clean_state": "Clean state files (state.json)",

novel_downloader/locales/zh.json

@@ -58,6 +58,7 @@
   "download_option_site": "网站来源, 默认为 '{default}'",
   "download_using_config": "使用配置: {path}",
   "download_site_info": "站点: {site}",
+  "download_site_mode": "使用模式: {mode}",
   "download_no_ids": "未提供书籍 ID, 正在退出",
   "download_fail_get_ids": "从配置获取书籍 ID 失败: {err}",
   "download_only_example": "只发现示例书籍 ID (例如 '{example}')",
@@ -65,6 +66,9 @@
   "download_downloading": "正在从 {site} 下载书籍 {book_id}...",
   "download_prompt_parse": "结束...",
 
+  "login_prompt_intro": "需要手动登录, 请切换到浏览器窗口完成登录",
+  "login_prompt_press_enter": "第 {attempt}/{max_retries} 次尝试: 请在浏览器中完成登录后按回车键...",
+
   "clean_logs": "清理日志目录",
   "clean_cache": "清理脚本和浏览器缓存",
   "clean_state": "清理状态文件 (state.json)",

novel_downloader/utils/constants.py

@@ -26,11 +26,12 @@ LOGGER_NAME = PACKAGE_NAME  # Root logger name
 # -----------------------------------------------------------------------------
 # Base config directory (e.g. ~/AppData/Local/novel_downloader/)
 BASE_CONFIG_DIR = Path(user_config_dir(APP_DIR_NAME, appauthor=False))
+WORK_DIR = Path.cwd()
 PACKAGE_ROOT: Path = Path(__file__).parent.parent
 LOCALES_DIR: Path = PACKAGE_ROOT / "locales"
 
 # Subdirectories under BASE_CONFIG_DIR
-LOGGER_DIR = BASE_CONFIG_DIR / "logs"
+LOGGER_DIR = WORK_DIR / "logs"
 JS_SCRIPT_DIR = BASE_CONFIG_DIR / "scripts"
 STATE_DIR = BASE_CONFIG_DIR / "state"
 DATA_DIR = BASE_CONFIG_DIR / "data"

novel_downloader/utils/time_utils/datetime_utils.py

@@ -106,7 +106,7 @@ 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_tz_str:     Timezone of to_time_str. Defaults to 'UTC'.

novel_downloader/utils/time_utils/sleep_utils.py

@@ -20,24 +20,40 @@ logger = logging.getLogger(__name__)
 
 
 def sleep_with_random_delay(
-    base: float, spread: float = 1.0, *, max_sleep: Optional[float] = None
+    base: float,
+    add_spread: float = 0.0,
+    mul_spread: float = 1.0,
+    *,
+    max_sleep: Optional[float] = None,
 ) -> None:
     """
-    Sleep for a random duration between `base` and `base + spread`,
-    optionally capped by `max_sleep`.
+    Sleep for a random duration by combining multiplicative and additive jitter.
 
-    Useful for simulating human-like behavior or preventing rate-limiting
-    issues in scripts.
+    The total sleep time is computed as:
 
-    :param base: Minimum number of seconds to sleep.
-    :param spread: Maximum extra seconds to add on top of base (default: 1.0).
-    :param max_sleep: Optional upper limit for the total sleep duration.
+        duration = base * uniform(1.0, mul_spread) + uniform(0, add_spread)
+
+    If `max_sleep` is provided, the duration will be capped at that value.
+
+    :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 spread < 0:
-        logger.warning("[time] Invalid parameters: base=%s, spread=%s", base, spread)
+    if base < 0 or add_spread < 0 or mul_spread < 0:
+        logger.warning(
+            "[sleep] Invalid parameters: base=%s, add_spread=%s, mul_spread=%s",
+            base,
+            add_spread,
+            mul_spread,
+        )
         return
 
-    duration = random.uniform(base, base + spread)
+    # Calculate the raw 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)
 

{novel_downloader-1.2.1.dist-info → novel_downloader-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.2.1
+Version: 1.2.2
 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

{novel_downloader-1.2.1.dist-info → novel_downloader-1.2.2.dist-info}/RECORD

@@ -1,69 +1,69 @@
-novel_downloader/__init__.py,sha256=XOpc1EqvKxLGY9qvIlEY7_tCe_HUpPbsjT1S0DFq-68,242
+novel_downloader/__init__.py,sha256=LCdmt0Int1WSZ3n25_tdJ7Mm-gknw2F-Sg4xKyMLWJs,242
 novel_downloader/cli/__init__.py,sha256=ocGwOO4kmkby8VNol92UikMI1RPUJLv9i5xmB7wbpmw,198
 novel_downloader/cli/clean.py,sha256=9_hOrxKg8nY7q6cyR8iNech0vSREGagPBmdB4k8Te2U,3937
-novel_downloader/cli/download.py,sha256=l-Ht2duKI78EMR8vTEbdVnwFT9NkWe87l3L1LmmIuZc,4156
+novel_downloader/cli/download.py,sha256=WZLnf8cckAGe9t7hI6WWgjrm_KRa67pTwEC-YJBAmFc,4223
 novel_downloader/cli/interactive.py,sha256=6vROwPsvupb_TWH1dd_78FDqvtAaiPfyEBvQVai9E9c,2154
 novel_downloader/cli/main.py,sha256=km1MwHzIVZFcxUlKLRiiMctJlGHWKZNjRKrgAGQjkMs,1183
 novel_downloader/cli/settings.py,sha256=bV3Hgg502V9goeP3g2xSiF-PMQB9G32qGmjb8ncTENA,6522
 novel_downloader/config/__init__.py,sha256=tJ2k7nwZbxgqw1kKgJM4g1yu5-2fsx2LXU3VTadrTJ4,1129
-novel_downloader/config/adapter.py,sha256=ksirRvp4038Xe3tu93Mwm93Iff0fOKNinJnXA746Xik,5949
+novel_downloader/config/adapter.py,sha256=R1y1g7uDBxtDz_sVsDGl2-iasQNAtWSmYdSk-mcFoAA,6698
 novel_downloader/config/loader.py,sha256=_rm9rp1lmHYg-A7F_0PQETWjlXbvtyJYaqQD5oI-1O0,5690
-novel_downloader/config/models.py,sha256=WWzwwWQB2BiiXc3KhJxW6N3vr9JIrqEZ0s4reIcH-vA,5087
+novel_downloader/config/models.py,sha256=i7i1yQzY5lAZWDBhi5ZXqzthlanhvhAc3oViMMoJFyw,5139
 novel_downloader/config/site_rules.py,sha256=WRw12Tfue-ErAPGKq506gRIqKOxWU-u96kay3JDgTNc,3031
 novel_downloader/core/__init__.py,sha256=D-ACiIqP0rdARZmjBnF6WMKGvvjVtxGRIM7GhOS9kh4,779
 novel_downloader/core/downloaders/__init__.py,sha256=Qp0q4p7zTy7lReQQF0hDP7ALUQnNflSNNIl4F7iPGz0,601
 novel_downloader/core/downloaders/base_async_downloader.py,sha256=8lMSVLU-VtGIdEMGkS0s_rEJpqCgu2WaljBvsEDyPN4,4281
 novel_downloader/core/downloaders/base_downloader.py,sha256=kFw_yn3QRbWqU9jXJni4IGA8P3AxZf9gfjgfu01TauY,5371
 novel_downloader/core/downloaders/common_asynb_downloader.py,sha256=u1ODvh_n13CSGWwjkBIMoThTbCeACX5mOhv5ub2Cd0c,7120
-novel_downloader/core/downloaders/common_downloader.py,sha256=Ru60j-S9I-Nj1P7gNZJjohJ1H8gAuvK1bELPMeZ2TTo,6532
-novel_downloader/core/downloaders/qidian_downloader.py,sha256=Btt59d8N925gx3RqTN7rqaHhMQgLxzPtOhE4Iq6wl1k,7354
+novel_downloader/core/downloaders/common_downloader.py,sha256=-HT7pi8bCSAdIcrU9CFHz26iqgtPhlUTI2MoE7ldCfY,6506
+novel_downloader/core/downloaders/qidian_downloader.py,sha256=KH-rPvwhWsZ9hyuvZxhQ9Q42LDFiAABpMlgReeX2nzI,7328
 novel_downloader/core/factory/__init__.py,sha256=qGqeROj8Dp_5iNtgWytkrUNI0ICab7SCNK3lba3H_NU,743
-novel_downloader/core/factory/downloader_factory.py,sha256=54lgfJ8KDJWYlBfWb6iWniRe55K9bPkcTTRVtipH7nU,5047
+novel_downloader/core/factory/downloader_factory.py,sha256=ldWFZ3189rxW2cWTNcwidiPisJNuaxD8OYB5YyjOXRU,5110
 novel_downloader/core/factory/parser_factory.py,sha256=4PxiagtSKY58azFsmEWfq2f5vhVbtMFm5gAXS3oQF08,1828
 novel_downloader/core/factory/requester_factory.py,sha256=OEK2S-rj8vw4IdDTMTEWcb7k7lRmmWBnfijhYnlOCc0,3173
 novel_downloader/core/factory/saver_factory.py,sha256=OgZPDOWVIfhxLFiVBKI5jaNOEKmzP9f3YWDOnw63Hfc,1275
 novel_downloader/core/interfaces/__init__.py,sha256=jeT8BmEEjIazVyX80ZdzQXgTccEj-ktG6Bbjs9uAVUM,843
 novel_downloader/core/interfaces/async_downloader_protocol.py,sha256=QWjdhNc39hC3bD8Q1lUpBv2GqX3roxVxzKWh6cgwLhk,1002
-novel_downloader/core/interfaces/async_requester_protocol.py,sha256=fvxw3fFO-azxc9RMvVjq8CUv7RViBQG1KUKIafr-qPE,2281
+novel_downloader/core/interfaces/async_requester_protocol.py,sha256=Jd54mJWnNt_BE2RRGYGmGDe93MM0I4xBLL4m6u6V_Is,2344
 novel_downloader/core/interfaces/downloader_protocol.py,sha256=YJdSAE9uBWF7wNLWmlKsYd3J7M4rXOjqDV5m9O7kfio,947
 novel_downloader/core/interfaces/parser_protocol.py,sha256=A2wIe7shEGdeKsNDFpMuPI8HFrK_H34HOseVAzqcnTo,1280
-novel_downloader/core/interfaces/requester_protocol.py,sha256=TbzVWKf4w0k5Wk1UmoAr49GVuGRv_Z1abTaXM_d6_KM,1994
+novel_downloader/core/interfaces/requester_protocol.py,sha256=Zskzwom104GWjB0LrV-VvAR7vfTB3LAcHvV110ISdo0,2058
 novel_downloader/core/interfaces/saver_protocol.py,sha256=_3ha4koF-xBrogJwvCOsQM3GEXfLn3_aYZHvmRd1ZR4,1623
 novel_downloader/core/parsers/__init__.py,sha256=TSarXiYxthyjFgruRFkpMEucqmylrCtR_4Y1C1RVMhk,544
-novel_downloader/core/parsers/base_parser.py,sha256=TCytPIEmh7mJPiaIfPyf2P16OO5jnB0tTdi1duBv76Q,2924
+novel_downloader/core/parsers/base_parser.py,sha256=mRv6tmbWIuX5XnXYnSP9JMsXECgykZymq4zWNNk7wDQ,2936
 novel_downloader/core/parsers/common_parser/__init__.py,sha256=GmV7Yj57zbLK0-WYmPtv6x1AhKwa3lzKlqsU7mc3lzg,379
-novel_downloader/core/parsers/common_parser/helper.py,sha256=gH5M5SAc3aHWj6HylJttDrw4keIZb9RgBc_gT8jhhHo,12017
+novel_downloader/core/parsers/common_parser/helper.py,sha256=gY3HHYnXGHHiCaig59T7IlI7Fa7XEqlmAAKWGmeSmXI,12090
 novel_downloader/core/parsers/common_parser/main_parser.py,sha256=ANvkZMYACZEwaYLz56lLyBz9dc_XqZMvWp2_jWWoF3g,2868
 novel_downloader/core/parsers/qidian_parser/__init__.py,sha256=mYbZvWMn4oFFX3qGhGx6Qo6oqvE5I71b-jbanWsTOSI,522
 novel_downloader/core/parsers/qidian_parser/browser/__init__.py,sha256=E8kMkQW_LdmVFYpHbbYtJTLNTYOy9XItQf_h7KcnGIU,353
-novel_downloader/core/parsers/qidian_parser/browser/chapter_encrypted.py,sha256=65pm3-DrHUH--wzo317yks0fbpcFZm_INB-hVboTqBo,17696
+novel_downloader/core/parsers/qidian_parser/browser/chapter_encrypted.py,sha256=v-sCfQYyRNOdZ12Qlb9b5Tqq69rcOS_CKBUG5XG9WUs,17713
 novel_downloader/core/parsers/qidian_parser/browser/chapter_normal.py,sha256=SZ9Ncw6yLCRo4gJNEtv4V8N2WfONvEAc8lftJREsBTY,3190
 novel_downloader/core/parsers/qidian_parser/browser/chapter_router.py,sha256=qjN10SpQCUMjFcCaWnqIZhcLDx5sN5jzDfWIrBSbnyo,2101
-novel_downloader/core/parsers/qidian_parser/browser/main_parser.py,sha256=vElnyAzZ5douexl-1n_oUY64pfB6st0wYzcF9DIdVec,3844
+novel_downloader/core/parsers/qidian_parser/browser/main_parser.py,sha256=8nmmTlhgina3JNrKoIMkFoNF6d9ztki7kAcCyGysy4g,3856
 novel_downloader/core/parsers/qidian_parser/session/__init__.py,sha256=Rs2Sz1vNn1-UdpY0O_reECBN4kgb3JYHQZoZ20P7lHU,358
-novel_downloader/core/parsers/qidian_parser/session/chapter_encrypted.py,sha256=EgY9qo9v3wx2CZ95zD_Rzcbu0FvfwWtkLuaP3mEcP2c,15999
+novel_downloader/core/parsers/qidian_parser/session/chapter_encrypted.py,sha256=XbQV0MQVsiumyrwGddAUaK9JrZpWZlfbZ0_2vBhGupU,16016
 novel_downloader/core/parsers/qidian_parser/session/chapter_normal.py,sha256=ySQ7vUs4dLCkHv_nPSifDnH3xq3wqxa9FWGy_ETX-uw,3875
 novel_downloader/core/parsers/qidian_parser/session/chapter_router.py,sha256=ob8ULDhNdnJgU3rlA-tLy0w0PqbC20vi8auFqQipJww,1978
-novel_downloader/core/parsers/qidian_parser/session/main_parser.py,sha256=F_uFibBD6BUIf7JkwurfQ9TEA5zAJqhR5C4Bf9b7hZs,3935
+novel_downloader/core/parsers/qidian_parser/session/main_parser.py,sha256=fL-IYhd99Rbb2eHCOy0DmYpmHeIOSe3DIFbtQKCj53s,3947
 novel_downloader/core/parsers/qidian_parser/session/node_decryptor.py,sha256=7ZuneGzL7HX1g8taMzn-2qkJXLDHgrVee-FDkMZtIIw,5755
 novel_downloader/core/parsers/qidian_parser/shared/__init__.py,sha256=K5HX7pgiRiJuTLdbQDbtm60mO-sXgr6bo5Ft8H1-JLs,978
-novel_downloader/core/parsers/qidian_parser/shared/book_info_parser.py,sha256=juCV72QKcaAjQZU-j6XiBM1VgdRrXY9w_2NHrflHsv4,3047
-novel_downloader/core/parsers/qidian_parser/shared/helpers.py,sha256=E8cWVhehaMLNXQAq2whIKl29xAULUzW4MdZvWshDb9Y,4284
+novel_downloader/core/parsers/qidian_parser/shared/book_info_parser.py,sha256=CGoJXRrf65CjJU3wPjZ8FRy96zV2rkYyWSMEyEFUrzE,4853
+novel_downloader/core/parsers/qidian_parser/shared/helpers.py,sha256=zQqcts8f_JddtKvQjvVJBJQvN5HjeaqlP2I3ztwO75o,4306
 novel_downloader/core/requesters/__init__.py,sha256=U2jDvt5RxF5P9yL2lwyZ-cRueJBZgRnjil3_5TvAh3Y,798
-novel_downloader/core/requesters/base_async_session.py,sha256=7hQfdUCFL-JnJiEltPMfWVrX2tjSntnnAazG1ygh6pU,10564
-novel_downloader/core/requesters/base_browser.py,sha256=oHJA0JecYyODkfTmL2L2qMe4PnR-Y_Md_zblD5wQdP4,6759
-novel_downloader/core/requesters/base_session.py,sha256=p7TvslYam_8WhIxp7LSBPQ7nWh0vG5KrcjuW24B4y1U,8255
+novel_downloader/core/requesters/base_async_session.py,sha256=xojNO_TCLUHmkuk379ttoiScHwmLCNhQAFzQKSpk5AM,10635
+novel_downloader/core/requesters/base_browser.py,sha256=HceDLOkl86K_nAkZR1XGIzSa-4KyFGt0dG5PyhefJ3c,6899
+novel_downloader/core/requesters/base_session.py,sha256=0yl3wR-myu-r9NrtwnGWzEFMzWPxcD3ROT5x9xeX6zQ,8328
 novel_downloader/core/requesters/common_requester/__init__.py,sha256=kVKZyrS7PVlUnaV1xGsZdoW2J9XuyQ11A4oMV9Cc64Q,523
 novel_downloader/core/requesters/common_requester/common_async_session.py,sha256=Bt_pgiJdxfoSDswMANeiZxaUQ4E5YitqEmcTlL4ImLY,3556
-novel_downloader/core/requesters/common_requester/common_session.py,sha256=pdTad7LibvHh_4Uh801unyx1qN1SUsSivKMeM6GLyUk,4654
+novel_downloader/core/requesters/common_requester/common_session.py,sha256=hzah5pvRqFBTzmz1J5d7GE5jbpKSOZWBPz-lh18cTv4,4686
 novel_downloader/core/requesters/qidian_requester/__init__.py,sha256=s0ldqNvfqUsEnm_biM_bXEGN7gz88Z5IAx1OBvGW1lY,682
-novel_downloader/core/requesters/qidian_requester/qidian_broswer.py,sha256=kzhLvdX6wIxy-CmEN-7wkrTCEEC4dVPBqGMLt3aj8Uc,14111
-novel_downloader/core/requesters/qidian_requester/qidian_session.py,sha256=huZflPnQoKglGNxP0pPD-wVoRZC90ER7hrwFo7WbM0M,7670
+novel_downloader/core/requesters/qidian_requester/qidian_broswer.py,sha256=BkweHqf-TEC2VCGKFxdUp24lPDuQPUepfHPFUXUgTh0,15146
+novel_downloader/core/requesters/qidian_requester/qidian_session.py,sha256=R-B6Hc61v5C-KGdEckDJWBt7Bnn_dbpW5ukQgh3x--Q,7664
 novel_downloader/core/savers/__init__.py,sha256=p9O6p8ZUblrSheDVJoTSuDr6s1mJpQi8mz3QmQ16nHs,391
 novel_downloader/core/savers/base_saver.py,sha256=VocVl8go80IkzAp9qY4dgZjmLbK8TVkg48Ugl53pxrc,5513
 novel_downloader/core/savers/qidian_saver.py,sha256=MVAcWdM-IX_qsRW5It2aIkx9QPdRCLcZGcD3ihfm3gU,627
 novel_downloader/core/savers/common_saver/__init__.py,sha256=Pg52cjAwG9fgT5qWgVer5oLMACU-duNFNbtfcq4t5xA,292
-novel_downloader/core/savers/common_saver/common_epub.py,sha256=nkLCMy6B5-4qiCDc6hHgX1eQc0xPHgZvNSef34lPIiw,7189
+novel_downloader/core/savers/common_saver/common_epub.py,sha256=80a-ibhhTy08wsZr7uiqrlvmITcsd1MH-z1OAj1Dl3c,7182
 novel_downloader/core/savers/common_saver/common_txt.py,sha256=fgBoKPApmODeUoxCi54txoD322G7mlU9o8HEM5X5atk,5765
 novel_downloader/core/savers/common_saver/main_saver.py,sha256=scjERGgC7X2R3f0KuLwf462VHkFJ2D2duod53aWlMkg,2765
 novel_downloader/core/savers/epub_utils/__init__.py,sha256=rqWUMkdebZ2dO-aZRYSutZ-w5uKgFVwe83nBJbYx40E,738
@@ -71,8 +71,8 @@ novel_downloader/core/savers/epub_utils/css_builder.py,sha256=ZiYEAuC4_u3BWBcf6-
 novel_downloader/core/savers/epub_utils/initializer.py,sha256=QuPWuChq2dcFlGp-PeZBrhfqSwoM7Nko-zHe9beluZw,3255
 novel_downloader/core/savers/epub_utils/text_to_html.py,sha256=UW70pMmc9HdgSCMKVEgukONFdlNCmQIKs9PCDLNAFQU,4117
 novel_downloader/core/savers/epub_utils/volume_intro.py,sha256=1NhnLKRL_ieoDgXTRt3vTNeENGvUj7JTZxTME4TmYm8,1820
-novel_downloader/locales/en.json,sha256=7xPlFLf6ByH0VMnGTTRC_6gRSW2IdTvQnKa5_FquSsk,5277
-novel_downloader/locales/zh.json,sha256=TylYUKSUUbG4Fh_DQazUNTY96HriQWyBfKjh1FrI0xM,5163
+novel_downloader/locales/en.json,sha256=4Zn2cD2vGkHHIam2j_Ig-gpicD14L3ufKX_lq0k0yR4,5531
+novel_downloader/locales/zh.json,sha256=nKmxyb84gmq9tg9DFLSx1r0MWLmo4Jwzf27S4ggDzV4,5420
 novel_downloader/resources/config/rules.toml,sha256=hrED6h3Z3cjSY5hRPQhp4TFAU5QXnN9xHfVABOJQNrM,4979
 novel_downloader/resources/config/settings.yaml,sha256=NxtYrf2HWJQyGwIuj3f3JKA72Do5WPvSghonPM0Q7SM,3493
 novel_downloader/resources/css_styles/main.css,sha256=WM6GePwdOGgM86fbbOxQ0_0oerTBDZeQHt8zRVfcJp8,1617
@@ -83,7 +83,7 @@ novel_downloader/resources/json/replace_word_map.json,sha256=ptL9sGO9aK7rnnAaOIy
 novel_downloader/resources/text/blacklist.txt,sha256=sovK9JgARZP3lud5b1EZgvv8LSVKPthf4ADpCSZZgQ8,154
 novel_downloader/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 novel_downloader/utils/cache.py,sha256=NB5j7CWNscfE4eFA0A9O5mYR1eW-216M-ljlMo0LDqE,615
-novel_downloader/utils/constants.py,sha256=VETwA_prTjLUejmJgrRnOn0QbwNKO4aTHf41dJJy7uE,5505
+novel_downloader/utils/constants.py,sha256=geLu9ufkM1plktIbF2VRzS5N5_N2XuHn0T03Kc0lGCQ,5520
 novel_downloader/utils/crypto_utils.py,sha256=whGgir2oi_17pNteiIRztiMNaB-ZP63GMP3KPJkXA80,4178
 novel_downloader/utils/hash_store.py,sha256=rpr61GsvZ9wT_1fEn4_83JZ-nWc1KLtcvb56ZqHawdk,9826
 novel_downloader/utils/hash_utils.py,sha256=6S4-Q_uLNzdEDkBOUG9QEcflbuPFNDAYe6Gx718AOo4,2998
@@ -105,11 +105,11 @@ novel_downloader/utils/text_utils/diff_display.py,sha256=cLjpeAOtpLOVMHnjgq2yv91
 novel_downloader/utils/text_utils/font_mapping.py,sha256=lai3lZSaxvSL1BZWgD6JLWdI56aWlZDeZ3zUYQS8pkc,916
 novel_downloader/utils/text_utils/text_cleaning.py,sha256=1yuaDeUBHqBRkkWhw43rV1i8TL5rx1yK0I78FyEwcTw,1656
 novel_downloader/utils/time_utils/__init__.py,sha256=bRpO14eorfH5C5xfqvW7QwSe3fQHhpr34j4O3qY5cGc,580
-novel_downloader/utils/time_utils/datetime_utils.py,sha256=xYKuI2K6DKwZdfUBZ0j1SNbmHjhYU7hIu46NzlZqr3o,4887
-novel_downloader/utils/time_utils/sleep_utils.py,sha256=CffWLotrhOZ-uYwC8Nb1cwZrAO2p83JDIrCGZLQuEC0,1384
-novel_downloader-1.2.1.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
-novel_downloader-1.2.1.dist-info/METADATA,sha256=3Wvzvnm4MzObnOT-71EOrmC1UbO1f9yNbfOlFpdFgdw,6291
-novel_downloader-1.2.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-novel_downloader-1.2.1.dist-info/entry_points.txt,sha256=v23QrJrfrAcYpxUYslCVxubOVRRTaTw7vlG_tfMsFP8,65
-novel_downloader-1.2.1.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
-novel_downloader-1.2.1.dist-info/RECORD,,
+novel_downloader/utils/time_utils/datetime_utils.py,sha256=BX6W2dWpqEDMpAXF0pm2bPT7xZsy_Q_TZAiwd3dsiiE,4883
+novel_downloader/utils/time_utils/sleep_utils.py,sha256=xClrFcjn4DdOO5KskO5WkGKt6LKZx0Cb8SMH8mQrlT0,1864
+novel_downloader-1.2.2.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
+novel_downloader-1.2.2.dist-info/METADATA,sha256=IjqO-vr2DU20Tdz3JEHo5hSWI6-3qDuXsbFAW8Af68c,6291
+novel_downloader-1.2.2.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+novel_downloader-1.2.2.dist-info/entry_points.txt,sha256=v23QrJrfrAcYpxUYslCVxubOVRRTaTw7vlG_tfMsFP8,65
+novel_downloader-1.2.2.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
+novel_downloader-1.2.2.dist-info/RECORD,,

{novel_downloader-1.2.1.dist-info → novel_downloader-1.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any