novel-downloader 1.4.2__py3-none-any.whl → 1.4.4__py3-none-any.whl

novel_downloader/__init__.py

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

novel_downloader/cli/download.py

@@ -161,7 +161,6 @@ async def _download(
         downloader = get_downloader(
             fetcher=fetcher,
             parser=parser,
-            exporter=exporter,
             site=site,
             config=downloader_cfg,
         )
@@ -172,6 +171,7 @@ async def _download(
                 book,
                 progress_hook=_print_progress,
             )
+            await asyncio.to_thread(exporter.export, book["book_id"])
 
         if downloader_cfg.login_required and fetcher.is_logged_in:
             await fetcher.save_state()

novel_downloader/config/adapter.py

@@ -127,6 +127,7 @@ class ConfigAdapter:
         site_cfg = self._get_site_cfg()
         return ParserConfig(
             cache_dir=gen.get("cache_dir", "./novel_cache"),
+            use_truncation=site_cfg.get("use_truncation", True),
             decode_font=font_ocr.get("decode_font", False),
             use_freq=font_ocr.get("use_freq", False),
             use_ocr=font_ocr.get("use_ocr", True),

novel_downloader/core/__init__.py

@@ -14,8 +14,26 @@ downloading and processing online novel content, including:
 - Exporter: Responsible for exporting downloaded data into various output formats.
 """
 
-from .factory import get_parser
+from .factory import (
+    get_downloader,
+    get_exporter,
+    get_fetcher,
+    get_parser,
+)
+from .interfaces import (
+    DownloaderProtocol,
+    ExporterProtocol,
+    FetcherProtocol,
+    ParserProtocol,
+)
 
 __all__ = [
+    "get_downloader",
+    "get_exporter",
+    "get_fetcher",
     "get_parser",
+    "DownloaderProtocol",
+    "ExporterProtocol",
+    "FetcherProtocol",
+    "ParserProtocol",
 ]

novel_downloader/core/downloaders/base.py

@@ -15,7 +15,6 @@ from typing import Any
 
 from novel_downloader.core.interfaces import (
     DownloaderProtocol,
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -34,13 +33,11 @@ class BaseDownloader(DownloaderProtocol, abc.ABC):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
         site: str,
     ):
         self._fetcher = fetcher
         self._parser = parser
-        self._exporter = exporter
         self._config = config
         self._site = site
 
@@ -158,10 +155,6 @@ class BaseDownloader(DownloaderProtocol, abc.ABC):
     def parser(self) -> ParserProtocol:
         return self._parser
 
-    @property
-    def exporter(self) -> ExporterProtocol:
-        return self._exporter
-
     @property
     def config(self) -> DownloaderConfig:
         return self._config

novel_downloader/core/downloaders/biquge.py

@@ -7,7 +7,6 @@ novel_downloader.core.downloaders.biquge
 
 from novel_downloader.core.downloaders.common import CommonDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -21,7 +20,6 @@ class BiqugeDownloader(CommonDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
-        super().__init__(fetcher, parser, exporter, config, "biquge")
+        super().__init__(fetcher, parser, config, "biquge")

novel_downloader/core/downloaders/common.py

@@ -440,8 +440,6 @@ class CommonDownloader(BaseDownloader):
         normal_cs.close()
         save_as_json(book_info, info_path)
 
-        await asyncio.to_thread(self.exporter.export, book_id)
-
         self.logger.info(
             "%s Novel '%s' download completed.",
             TAG,

novel_downloader/core/downloaders/esjzone.py

@@ -7,7 +7,6 @@ novel_downloader.core.downloaders.esjzone
 
 from novel_downloader.core.downloaders.common import CommonDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -21,7 +20,6 @@ class EsjzoneDownloader(CommonDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
-        super().__init__(fetcher, parser, exporter, config, "esjzone")
+        super().__init__(fetcher, parser, config, "esjzone")

novel_downloader/core/downloaders/linovelib.py

@@ -7,7 +7,6 @@ novel_downloader.core.downloaders.linovelib
 
 from novel_downloader.core.downloaders.common import CommonDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -21,7 +20,6 @@ class LinovelibDownloader(CommonDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
-        super().__init__(fetcher, parser, exporter, config, "linovelib")
+        super().__init__(fetcher, parser, config, "linovelib")

novel_downloader/core/downloaders/qianbi.py

@@ -7,7 +7,6 @@ novel_downloader.core.downloaders.qianbi
 
 from novel_downloader.core.downloaders.common import CommonDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -21,7 +20,6 @@ class QianbiDownloader(CommonDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
-        super().__init__(fetcher, parser, exporter, config, "qianbi")
+        super().__init__(fetcher, parser, config, "qianbi")

novel_downloader/core/downloaders/qidian.py

@@ -13,7 +13,6 @@ from typing import Any, cast
 
 from novel_downloader.core.downloaders.base import BaseDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -41,11 +40,10 @@ class QidianDownloader(BaseDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
         config.request_interval = max(1.0, config.request_interval)
-        super().__init__(fetcher, parser, exporter, config, "qidian")
+        super().__init__(fetcher, parser, config, "qidian")
 
     async def _download_one(
         self,
@@ -351,8 +349,6 @@ class QidianDownloader(BaseDownloader):
         normal_cs.close()
         encrypted_cs.close()
 
-        await asyncio.to_thread(self.exporter.export, book_id)
-
         self.logger.info(
             "%s Novel '%s' download completed.",
             TAG,

novel_downloader/core/downloaders/sfacg.py

@@ -7,7 +7,6 @@ novel_downloader.core.downloaders.sfacg
 
 from novel_downloader.core.downloaders.common import CommonDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -21,7 +20,6 @@ class SfacgDownloader(CommonDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
-        super().__init__(fetcher, parser, exporter, config, "sfacg")
+        super().__init__(fetcher, parser, config, "sfacg")

novel_downloader/core/downloaders/yamibo.py

@@ -7,7 +7,6 @@ novel_downloader.core.downloaders.yamibo
 
 from novel_downloader.core.downloaders.common import CommonDownloader
 from novel_downloader.core.interfaces import (
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
@@ -21,7 +20,6 @@ class YamiboDownloader(CommonDownloader):
         self,
         fetcher: FetcherProtocol,
         parser: ParserProtocol,
-        exporter: ExporterProtocol,
         config: DownloaderConfig,
     ):
-        super().__init__(fetcher, parser, exporter, config, "yamibo")
+        super().__init__(fetcher, parser, config, "yamibo")

novel_downloader/core/factory/downloader.py

@@ -22,14 +22,13 @@ from novel_downloader.core.downloaders import (
 )
 from novel_downloader.core.interfaces import (
     DownloaderProtocol,
-    ExporterProtocol,
     FetcherProtocol,
     ParserProtocol,
 )
 from novel_downloader.models import DownloaderConfig
 
 DownloaderBuilder = Callable[
-    [FetcherProtocol, ParserProtocol, ExporterProtocol, DownloaderConfig],
+    [FetcherProtocol, ParserProtocol, DownloaderConfig],
     DownloaderProtocol,
 ]
 
@@ -47,7 +46,6 @@ _site_map: dict[str, DownloaderBuilder] = {
 def get_downloader(
     fetcher: FetcherProtocol,
     parser: ParserProtocol,
-    exporter: ExporterProtocol,
     site: str,
     config: DownloaderConfig,
 ) -> DownloaderProtocol:
@@ -56,7 +54,6 @@ def get_downloader(
 
     :param fetcher: Fetcher implementation
     :param parser: Parser implementation
-    :param exporter: Exporter implementation
     :param site: Site name (e.g., 'qidian')
     :param config: Downloader configuration
 
@@ -66,11 +63,11 @@ def get_downloader(
 
     # site-specific
     if site_key in _site_map:
-        return _site_map[site_key](fetcher, parser, exporter, config)
+        return _site_map[site_key](fetcher, parser, config)
 
     # fallback
     site_rules = load_site_rules()
     if site_key not in site_rules:
         raise ValueError(f"Unsupported site: {site}")
 
-    return CommonDownloader(fetcher, parser, exporter, config, site_key)
+    return CommonDownloader(fetcher, parser, config, site_key)

novel_downloader/core/fetchers/base/browser.py

@@ -201,19 +201,9 @@ class BaseBrowser(FetcherProtocol, abc.ABC):
         **kwargs: Any,
     ) -> str:
         if self._reuse_page:
-            if not self._page:
-                self._page = await self.context.new_page()
-            page = self._page
+            return await self._fetch_with_reuse(url, wait_until, referer, **kwargs)
         else:
-            page = await self.context.new_page()
-
-        await page.goto(url, wait_until=wait_until, referer=referer)
-        content = await page.content()
-
-        if not self._reuse_page:
-            await page.close()
-
-        return str(content)
+            return await self._fetch_with_new(url, wait_until, referer, **kwargs)
 
     async def load_state(self) -> bool:
         """ """
@@ -286,6 +276,36 @@ class BaseBrowser(FetcherProtocol, abc.ABC):
         await self.init(headless=headless)
         self.logger.debug("[browser] Browser restarted (headless=%s).", headless)
 
+    async def _fetch_with_new(
+        self,
+        url: str,
+        wait_until: Literal["commit", "domcontentloaded", "load", "networkidle"]
+        | None = "load",
+        referer: str | None = None,
+        **kwargs: Any,
+    ) -> str:
+        page = await self.context.new_page()
+        try:
+            await page.goto(url, wait_until=wait_until, referer=referer, **kwargs)
+            html: str = await page.content()
+            return html
+        finally:
+            await page.close()
+
+    async def _fetch_with_reuse(
+        self,
+        url: str,
+        wait_until: Literal["commit", "domcontentloaded", "load", "networkidle"]
+        | None = "load",
+        referer: str | None = None,
+        **kwargs: Any,
+    ) -> str:
+        if not self._page:
+            self._page = await self.context.new_page()
+        await self._page.goto(url, wait_until=wait_until, referer=referer, **kwargs)
+        html: str = await self._page.content()
+        return html
+
     @property
     def hostname(self) -> str:
         return ""

novel_downloader/core/fetchers/esjzone/browser.py

@@ -49,15 +49,17 @@ class EsjzoneBrowser(BaseBrowser):
 
         login_page = await self.context.new_page()
 
-        await login_page.goto(self.API_LOGIN_URL_1, wait_until="networkidle")
+        try:
+            await login_page.goto(self.API_LOGIN_URL_1, wait_until="networkidle")
 
-        await login_page.fill('input[name="email"]', username)
-        await login_page.fill('input[name="pwd"]', password)
+            await login_page.fill('input[name="email"]', username)
+            await login_page.fill('input[name="pwd"]', password)
 
-        await login_page.click('a.btn-send[data-send="mem_login"]')
+            await login_page.click('a.btn-send[data-send="mem_login"]')
 
-        await login_page.wait_for_load_state("networkidle")
-        await login_page.close()
+            await login_page.wait_for_load_state("networkidle")
+        finally:
+            await login_page.close()
 
         self._is_logged_in = await self._check_login_status()
 

novel_downloader/core/fetchers/qidian/browser.py

@@ -22,8 +22,8 @@ class QidianBrowser(BaseBrowser):
 
     HOMEPAGE_URL = "https://www.qidian.com/"
     BOOKCASE_URL = "https://my.qidian.com/bookcase/"
-    BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
-    # BOOK_INFO_URL = "https://www.qidian.com/book/{book_id}/"
+    # BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
+    BOOK_INFO_URL = "https://www.qidian.com/book/{book_id}/"
     CHAPTER_URL = "https://www.qidian.com/chapter/{book_id}/{chapter_id}/"
 
     LOGIN_URL = "https://passport.qidian.com/"

novel_downloader/core/fetchers/qidian/session.py

@@ -27,7 +27,8 @@ class QidianSession(BaseSession):
 
     HOMEPAGE_URL = "https://www.qidian.com/"
     BOOKCASE_URL = "https://my.qidian.com/bookcase/"
-    BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
+    # BOOK_INFO_URL = "https://book.qidian.com/info/{book_id}/"
+    BOOK_INFO_URL = "https://www.qidian.com/book/{book_id}/"
     CHAPTER_URL = "https://www.qidian.com/chapter/{book_id}/{chapter_id}/"
 
     LOGIN_URL = "https://passport.qidian.com/"

novel_downloader/core/fetchers/yamibo/browser.py

@@ -48,8 +48,8 @@ class YamiboBrowser(BaseBrowser):
             return False
 
         for i in range(1, attempt + 1):
+            login_page = await self.context.new_page()
             try:
-                login_page = await self.context.new_page()
                 await login_page.goto(self.LOGIN_URL, wait_until="networkidle")
 
                 await login_page.fill("#loginform-username", username)
@@ -68,8 +68,6 @@ class YamiboBrowser(BaseBrowser):
                         f"[auth] No URL change after login attempt {i}: {e}"
                     )
 
-                await login_page.close()
-
                 self._is_logged_in = await self._check_login_status()
                 if self._is_logged_in:
                     self.logger.info(f"[auth] Login successful on attempt {i}.")
@@ -83,6 +81,8 @@ class YamiboBrowser(BaseBrowser):
                 self.logger.error(
                     f"[auth] Unexpected error during login attempt {i}: {e}"
                 )
+            finally:
+                await login_page.close()
 
         self.logger.error(f"[auth] Login failed after {attempt} attempt(s).")
         return False

novel_downloader/core/parsers/qidian/book_info_parser.py

@@ -10,36 +10,19 @@ time, status, word count, summary, and volume-chapter structure.
 """
 
 import logging
+import re
+from datetime import datetime
 from typing import Any
 
 from lxml import html
 
 logger = logging.getLogger(__name__)
 
-_AUTHOR_XPATH = (
-    'string(//div[contains(@class, "book-info")]//a[contains(@class, "writer")])'
-)
-
 
 def _chapter_url_to_id(url: str) -> str:
     return url.rstrip("/").split("/")[-1]
 
 
-def _get_volume_name(
-    vol_elem: html.HtmlElement,
-) -> str:
-    """
-    Extracts the volume title from a <div class="volume"> element using lxml.
-    Ignores <a> tags, and extracts text from other elements.
-    """
-    h3_candidates = vol_elem.xpath(".//h3")
-    if not h3_candidates:
-        return ""
-    texts = vol_elem.xpath(".//h3//text()[not(ancestor::a)]")
-    full_text = "".join(texts).strip()
-    return full_text.split(chr(183))[0].strip()
-
-
 def parse_book_info(html_str: str) -> dict[str, Any]:
     """
     Extract metadata: title, author, cover_url, update_time, status,
@@ -52,59 +35,53 @@ def parse_book_info(html_str: str) -> dict[str, Any]:
     try:
         doc = html.fromstring(html_str)
 
-        book_name = doc.xpath('string(//h1/em[@id="bookName"])').strip()
-        info["book_name"] = book_name
+        info["book_name"] = doc.xpath('string(//h1[@id="bookName"])').strip()
 
-        author = doc.xpath(_AUTHOR_XPATH).strip()
-        info["author"] = author
+        info["author"] = doc.xpath('string(//a[@class="writer-name"])').strip()
 
-        cover_url = doc.xpath('string(//div[@class="book-img"]//img/@src)').strip()
-        info["cover_url"] = cover_url
+        book_id = doc.xpath('//a[@id="bookImg"]/@data-bid')[0]
+        info[
+            "cover_url"
+        ] = f"https://bookcover.yuewen.com/qdbimg/349573/{book_id}/600.webp"
 
-        update_raw = (
-            doc.xpath('string(//span[contains(@class, "update-time")])')
-            .replace("更新时间", "")
+        ut = (
+            doc.xpath('string(//span[@class="update-time"])')
+            .replace("更新时间:", "")
             .strip()
         )
-        info["update_time"] = update_raw
+        if re.match(r"^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$", ut):
+            info["update_time"] = ut
+        else:
+            info["update_time"] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
-        status = doc.xpath('string(//p[@class="tag"]/span[@class="blue"][1])').strip()
-        info["serial_status"] = status
+        info["serial_status"] = doc.xpath(
+            'string(//p[@class="book-attribute"]/span[1])'
+        ).strip()
 
-        tags = doc.xpath('//p[@class="tag"]/a[@class="red"]/text()')
+        tags = doc.xpath('//p[contains(@class,"all-label")]//a/text()')
         info["tags"] = [t.strip() for t in tags if t.strip()]
 
-        wc_number = doc.xpath("string(//p[em and cite][1]/em[1])").strip()
-        wc_unit = doc.xpath("string(//p[em and cite][1]/cite[1])").strip()
-        info["word_count"] = (
-            (wc_number + wc_unit) if wc_number and wc_unit else "Unknown"
-        )
+        info["word_count"] = doc.xpath('string(//p[@class="count"]/em[1])').strip()
 
         summary = doc.xpath('string(//p[@class="intro"])').strip()
         info["summary_brief"] = summary
 
-        intro_list = doc.xpath('//div[@class="book-intro"]/p')[0]
-        detail_intro = "\n".join(intro_list.itertext()).strip()
-        info["summary"] = detail_intro
+        raw = doc.xpath('//p[@id="book-intro-detail"]//text()')
+        info["summary"] = "\n".join(line.strip() for line in raw if line.strip())
 
         volumes = []
-        for vol_div in doc.xpath('//div[@class="volume-wrap"]/div[@class="volume"]'):
-            volume_name = _get_volume_name(vol_div)
+        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 = []
-            for li in vol_div.xpath(".//li"):
-                a = li.xpath(".//a")[0] if li.xpath(".//a") else None
-                if a is None or "href" not in a.attrib:
-                    continue
-                href = a.attrib["href"].strip()
-                title = "".join(a.itertext()).strip()
+            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": href,
-                        "chapterId": _chapter_url_to_id(href),
-                    }
+                    {"title": title, "url": url, "chapterId": _chapter_url_to_id(url)}
                 )
-            volumes.append({"volume_name": volume_name, "chapters": chapters})
+            volumes.append({"volume_name": vol_name, "chapters": chapters})
         info["volumes"] = volumes
 
     except Exception as e:

novel_downloader/core/parsers/qidian/chapter_encrypted.py

@@ -19,12 +19,16 @@ from lxml import html
 
 from novel_downloader.models import ChapterDict
 from novel_downloader.utils.network import download_font_file
-from novel_downloader.utils.text_utils import apply_font_mapping
+from novel_downloader.utils.text_utils import (
+    apply_font_mapping,
+    truncate_half_lines,
+)
 
 from .utils import (
     extract_chapter_info,
     find_ssr_page_context,
     get_decryptor,
+    is_duplicated,
     vip_status,
 )
 
@@ -76,6 +80,7 @@ def parse_encrypted_chapter(
         fixedFontWoff2_url = chapter_info["fixedFontWoff2"]
 
         title = chapter_info.get("chapterName", "Untitled")
+        duplicated = is_duplicated(ssr_data)
         raw_html = chapter_info.get("content", "")
         chapter_id = chapter_info.get("chapterId", chapter_id)
         fkp = chapter_info.get("fkp", "")
@@ -83,7 +88,7 @@ def parse_encrypted_chapter(
         update_time = chapter_info.get("updateTime", "")
         update_timestamp = chapter_info.get("updateTimestamp", 0)
         modify_time = chapter_info.get("modifyTime", 0)
-        word_count = chapter_info.get("wordsCount", 0)
+        word_count = chapter_info.get("actualWords", 0)
         seq = chapter_info.get("seq", None)
         volume = chapter_info.get("extra", {}).get("volumeName", "")
 
@@ -177,6 +182,9 @@ def parse_encrypted_chapter(
         final_paragraphs_str = "\n\n".join(
             line.strip() for line in original_text.splitlines() if line.strip()
         )
+        if parser._use_truncation and duplicated:
+            final_paragraphs_str = truncate_half_lines(final_paragraphs_str)
+
         return {
             "id": str(chapter_id),
             "title": str(title),
@@ -187,6 +195,7 @@ def parse_encrypted_chapter(
                 "update_timestamp": update_timestamp,
                 "modify_time": modify_time,
                 "word_count": word_count,
+                "duplicated": duplicated,
                 "seq": seq,
                 "volume": volume,
                 "encrypted": True,

novel_downloader/core/parsers/qidian/chapter_normal.py

@@ -15,11 +15,13 @@ from typing import TYPE_CHECKING
 from lxml import html
 
 from novel_downloader.models import ChapterDict
+from novel_downloader.utils.text_utils import truncate_half_lines
 
 from .utils import (
     extract_chapter_info,
     find_ssr_page_context,
     get_decryptor,
+    is_duplicated,
     vip_status,
 )
 
@@ -51,6 +53,7 @@ def parse_normal_chapter(
             return None
 
         title = chapter_info.get("chapterName", "Untitled")
+        duplicated = is_duplicated(ssr_data)
         raw_html = chapter_info.get("content", "")
         chapter_id = chapter_info.get("chapterId", chapter_id)
         fkp = chapter_info.get("fkp", "")
@@ -58,7 +61,7 @@ def parse_normal_chapter(
         update_time = chapter_info.get("updateTime", "")
         update_timestamp = chapter_info.get("updateTimestamp", 0)
         modify_time = chapter_info.get("modifyTime", 0)
-        word_count = chapter_info.get("wordsCount", 0)
+        word_count = chapter_info.get("actualWords", 0)
         seq = chapter_info.get("seq", None)
         volume = chapter_info.get("extra", {}).get("volumeName", "")
 
@@ -74,6 +77,9 @@ def parse_normal_chapter(
             if not chapter_text:
                 return None
 
+        if parser._use_truncation and duplicated:
+            chapter_text = truncate_half_lines(chapter_text)
+
         return {
             "id": str(chapter_id),
             "title": title,
@@ -84,6 +90,7 @@ def parse_normal_chapter(
                 "update_timestamp": update_timestamp,
                 "modify_time": modify_time,
                 "word_count": word_count,
+                "duplicated": duplicated,
                 "seq": seq,
                 "volume": volume,
                 "encrypted": False,

novel_downloader/core/parsers/qidian/main_parser.py

@@ -32,7 +32,11 @@ class QidianParser(BaseParser):
     Parser for Qidian site.
     """
 
-    def __init__(self, config: ParserConfig):
+    def __init__(
+        self,
+        config: ParserConfig,
+        fuid: str = "",
+    ):
         """
         Initialize the QidianParser with the given configuration.
 
@@ -41,6 +45,7 @@ class QidianParser(BaseParser):
         super().__init__(config)
 
         # Extract and store parser flags from config
+        self._use_truncation = config.use_truncation
         self._decode_font: bool = config.decode_font
         self._save_font_debug: bool = config.save_font_debug
 
@@ -52,7 +57,7 @@ class QidianParser(BaseParser):
             DATA_DIR / "qidian" / "browser_state.cookies",
             DATA_DIR / "qidian" / "session_state.cookies",
         ]
-        self._fuid: str = find_cookie_value(state_files, "ywguid")
+        self._fuid: str = fuid or find_cookie_value(state_files, "ywguid")
 
         self._font_ocr: FontOCR | None = None
         if self._decode_font:

novel_downloader/core/parsers/qidian/utils/__init__.py

@@ -9,6 +9,7 @@ from .helpers import (
     can_view_chapter,
     extract_chapter_info,
     find_ssr_page_context,
+    is_duplicated,
     is_encrypted,
     is_restricted_page,
     vip_status,
@@ -22,6 +23,7 @@ __all__ = [
     "vip_status",
     "can_view_chapter",
     "is_encrypted",
+    "is_duplicated",
     "QidianNodeDecryptor",
     "get_decryptor",
 ]

novel_downloader/core/parsers/qidian/utils/helpers.py

@@ -89,6 +89,15 @@ def can_view_chapter(ssr_data: dict[str, Any]) -> bool:
     return not (vip_status == 1 and is_buy == 0)
 
 
+def is_duplicated(ssr_data: dict[str, Any]) -> bool:
+    """
+    Check if chapter is marked as duplicated (eFW = 1).
+    """
+    chapter_info = extract_chapter_info(ssr_data)
+    efw_flag = chapter_info.get("eFW", 0)
+    return bool(efw_flag == 1)
+
+
 def is_encrypted(content: str | dict[str, Any]) -> bool:
     """
     Return True if content is encrypted.

novel_downloader/models/config.py

@@ -68,6 +68,7 @@ class DownloaderConfig:
 @dataclass
 class ParserConfig:
     cache_dir: str = "./novel_cache"
+    use_truncation: bool = True
     decode_font: bool = False
     use_freq: bool = False
     use_ocr: bool = True

novel_downloader/resources/config/settings.toml

@@ -52,6 +52,7 @@ book_ids = [
 ]
 mode = "session"                   # browser / session
 login_required = true              # 是否需要登录才能访问
+use_truncation = true              # 是否基于章节长度截断以避免重复内容
 
 [sites.biquge]  # 笔趣阁
 book_ids = [

novel_downloader/tui/screens/home.py

@@ -65,7 +65,13 @@ class HomeScreen(Screen):  # type: ignore[misc]
                 return
             id_list = {x.strip() for x in ids.split(",") if x.strip()}
             adapter = ConfigAdapter(config=self.app.config, site=str(site))
-            asyncio.create_task(self._download(adapter, str(site), id_list))
+            # asyncio.create_task(self._download(adapter, str(site), id_list))
+            self.run_worker(
+                self._download(adapter, str(site), id_list),
+                name="download",
+                group="downloads",
+                description="正在下载书籍...",
+            )
 
     def _make_title_bar(self) -> Horizontal:
         return Horizontal(
@@ -134,7 +140,6 @@ class HomeScreen(Screen):  # type: ignore[misc]
                 downloader = get_downloader(
                     fetcher=fetcher,
                     parser=parser,
-                    exporter=exporter,
                     site=site,
                     config=downloader_cfg,
                 )
@@ -145,6 +150,7 @@ class HomeScreen(Screen):  # type: ignore[misc]
                         {"book_id": book_id},
                         progress_hook=self._update_progress,
                     )
+                    await asyncio.to_thread(exporter.export, book_id)
 
                 if downloader_cfg.login_required and fetcher.is_logged_in:
                     await fetcher.save_state()

novel_downloader/tui/screens/login.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
 novel_downloader.tui.screens.login
----------------------------------
+----------------------------------
 
 """
 

novel_downloader/utils/{model_loader.py → fontocr/model_loader.py}

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """
-novel_downloader.utils.model_loader
------------------------------------
+novel_downloader.utils.fontocr.model_loader
+-------------------------------------------
 
 Utility functions for managing pre-trained model downloads.
 

novel_downloader/utils/fontocr/ocr_v1.py

@@ -25,7 +25,8 @@ from novel_downloader.utils.constants import (
     REC_IMAGE_SHAPE_MAP,
 )
 from novel_downloader.utils.hash_store import img_hash_store
-from novel_downloader.utils.model_loader import get_rec_chinese_char_model_dir
+
+from .model_loader import get_rec_chinese_char_model_dir
 
 logger = logging.getLogger(__name__)
 

novel_downloader/utils/fontocr/ocr_v2.py

@@ -36,7 +36,8 @@ from novel_downloader.utils.constants import (
     REC_IMAGE_SHAPE_MAP,
 )
 from novel_downloader.utils.hash_store import img_hash_store
-from novel_downloader.utils.model_loader import (
+
+from .model_loader import (
     get_rec_char_vector_dir,
     get_rec_chinese_char_model_dir,
 )

novel_downloader/utils/text_utils/__init__.py

@@ -15,12 +15,19 @@ Submodules:
 from .chapter_formatting import format_chapter
 from .diff_display import diff_inline_display
 from .font_mapping import apply_font_mapping
-from .text_cleaning import clean_chapter_title, is_promotional_line
+from .text_cleaning import (
+    clean_chapter_title,
+    content_prefix,
+    is_promotional_line,
+    truncate_half_lines,
+)
 
 __all__ = [
     "apply_font_mapping",
     "format_chapter",
     "clean_chapter_title",
     "is_promotional_line",
+    "content_prefix",
+    "truncate_half_lines",
     "diff_inline_display",
 ]

novel_downloader/utils/text_utils/text_cleaning.py

@@ -6,6 +6,7 @@ novel_downloader.utils.text_utils.text_cleaning
 Tools for detecting and removing promotional or ad-like content from text.
 """
 
+import math
 import re
 
 from novel_downloader.utils.file_utils.io import load_blacklisted_words
@@ -50,7 +51,57 @@ def is_promotional_line(line: str) -> bool:
     return False
 
 
+def content_prefix(
+    text: str,
+    n: int,
+    ignore_chars: set[str] | None = None,
+) -> str:
+    """
+    Return the prefix of `text` containing the first `n` non-ignored characters.
+
+    :param text: The full input string.
+    :param n: Number of content characters to include.
+    :param ignore_chars: Characters to ignore when counting content.
+    :return: Truncated string preserving original whitespace and line breaks.
+    """
+    ignore = ignore_chars or set()
+    cnt = 0
+
+    for i, ch in enumerate(text):
+        if ch not in ignore:
+            cnt += 1
+            if cnt >= n:
+                return text[: i + 1]
+
+    return text
+
+
+def truncate_half_lines(text: str) -> str:
+    """
+    Keep the first half of the lines (rounded up), preserving line breaks.
+
+    :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
+
+    return "\n".join(result_lines)
+
+
 __all__ = [
     "clean_chapter_title",
     "is_promotional_line",
+    "content_prefix",
+    "truncate_half_lines",
 ]

novel_downloader/utils/time_utils/datetime_utils.py

@@ -138,7 +138,7 @@ def calculate_time_difference(
 
     except Exception as e:
         logger.warning("[time] Failed to calculate time difference: %s", e)
-        return 0, 0, 0, 0
+        return 999, 23, 59, 59
 
 
 __all__ = [

{novel_downloader-1.4.2.dist-info → novel_downloader-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.4.2
+Version: 1.4.4
 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
@@ -182,6 +182,7 @@ pip install .
 - [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)
+- [模块与接口文档](https://github.com/BowenZ217/novel-downloader/blob/main/docs/api/README.md)
 - [TODO](https://github.com/BowenZ217/novel-downloader/blob/main/docs/todo.md)
 - [开发](https://github.com/BowenZ217/novel-downloader/blob/main/docs/develop.md)
 - [项目说明](#项目说明)

{novel_downloader-1.4.2.dist-info → novel_downloader-1.4.4.dist-info}/RECORD

@@ -1,25 +1,25 @@
-novel_downloader/__init__.py,sha256=qYZxJQ-xYLPTjMwE7FYcQM5HYV9Oo_bqCJY55hAqlcE,218
+novel_downloader/__init__.py,sha256=dWsU4eiEbY9H2_GSR5Y5XdVhEH4CyEbDyc7rzVr79qI,218
 novel_downloader/cli/__init__.py,sha256=-2HAut_U1e67MZGdvbpEJ1n5J-bRchzto6L4c-nWeXY,174
 novel_downloader/cli/clean.py,sha256=hOk8SJQwBCw2oOObTdEI79wpnmZ25uB1s9LQK1-4LNU,4487
 novel_downloader/cli/config.py,sha256=C6QLfegZLp4legmu8KenqyYKNdrk47bH0z86ujLP0pY,6509
-novel_downloader/cli/download.py,sha256=ff2KMsa9XnbsF_aUQcAc7a06hDYmk4-7yMv4iiXTWlI,6762
+novel_downloader/cli/download.py,sha256=wj6wW4osxdB0VA0VeO5Tt2f6HY5CL0Gp8BeoaMzb9Is,6801
 novel_downloader/cli/export.py,sha256=x9uvyLuvkuaDZGoH212aHZ7XyPT9b2S78AmTN6rkAu4,2283
 novel_downloader/cli/main.py,sha256=9J8KMuYwL01X6chIaXpQNeS5d3pHnwB9vA9XjKd8RrM,919
 novel_downloader/config/__init__.py,sha256=2mnf33MQOUnLGCnL1NtNV_rHBejNxBNIbobIGN0tw4E,666
-novel_downloader/config/adapter.py,sha256=hPRAomAlqhyUlNemm82e4m0SAYa33woulb5ePHMRC3o,8330
+novel_downloader/config/adapter.py,sha256=Kp_QOE-ntj5yWBYUnrdNj7ab-R9ZcmBNnMi_dHkv4Gs,8395
 novel_downloader/config/loader.py,sha256=jo_1rr3UKZRAFFYgO-oHpYLRhF431chmfx4fLGh0MKw,5743
 novel_downloader/config/site_rules.py,sha256=CJksBSvVAC4sR6cEruf4pM1Jv0zTJb1lcHq0Yn6LPFM,2979
-novel_downloader/core/__init__.py,sha256=zzrXjQfBUhfLmBD_95oHTjtTsR81NSRtHcxpYBxQlZ4,654
+novel_downloader/core/__init__.py,sha256=sYwhveDjNQu0oKfS9obWVJGmbxyN8lIWIRiGvGOBZRI,989
 novel_downloader/core/downloaders/__init__.py,sha256=AK5zeetVXOn_irgHp-NORPYW65UJM4CsF8ysxf2vKD4,1064
-novel_downloader/core/downloaders/base.py,sha256=h2Y73o9OC8URvlnNNQgwNVx4kk4oqFjk2AsyfmAfshg,6706
-novel_downloader/core/downloaders/biquge.py,sha256=PTm8eeaHVyw_nvtnuRpZ2hT7hLs2LEPV1Drd2O6idNM,651
-novel_downloader/core/downloaders/common.py,sha256=-3lp6lLoCubVwqMA4lx6YtnSmKPMA85T1K5m0_vizmg,16323
-novel_downloader/core/downloaders/esjzone.py,sha256=GBFJ3fIPov483QxkOTaKBU2wd2f8T4GdvzSbRaU9hDI,655
-novel_downloader/core/downloaders/linovelib.py,sha256=Cd43_70SKbKM8_C8c4qev3pLUgyziW9413qrA8EcStY,663
-novel_downloader/core/downloaders/qianbi.py,sha256=ARuk1xABOGCjlD_ct5hOKMgWloU187rUJBbICJ2yvkY,651
-novel_downloader/core/downloaders/qidian.py,sha256=PkUnOEq1TyKZea--b8nBgFqrhxD0UK8X4m9AUC_wFjk,13135
-novel_downloader/core/downloaders/sfacg.py,sha256=ShlkIIR6OW_x2FhNDi79S_3AL2CWId2upQmRkApee_E,647
-novel_downloader/core/downloaders/yamibo.py,sha256=9L0m5Zq0o1y44tCQ4ZRHHqdO3YresJkRAVvCtsQwouk,651
+novel_downloader/core/downloaders/base.py,sha256=aZECG_HkCPNOGoGY6n8hEue769J2tlAqHz5LHGSwwNw,6525
+novel_downloader/core/downloaders/biquge.py,sha256=u1HkO3UvIq9lrQGJrU8UCBEqMnqPstL_AnfTRcK0J3c,583
+novel_downloader/core/downloaders/common.py,sha256=TAojiAhVGXDaIxbCpAvB4FecLh1TSj8oQDuY9tNynC4,16259
+novel_downloader/core/downloaders/esjzone.py,sha256=rRT2zMft-js2aOMxL71tsWR-to9FIIzua48DzKVwpgM,587
+novel_downloader/core/downloaders/linovelib.py,sha256=tMRuZPRBBt-w0Te7A0Kc2Jjqz-Y_c3TmLhHxJSdxGXo,595
+novel_downloader/core/downloaders/qianbi.py,sha256=ZuwRjMW-2VZRxJxUg3n3168hyhX779cLRC3VSlUYZBU,583
+novel_downloader/core/downloaders/qidian.py,sha256=Zix-9dLMgt2kuMSOPbl9zdZ-TMawfOV5VkGRIrM6-T8,13003
+novel_downloader/core/downloaders/sfacg.py,sha256=kEp3N4ycXJFNh3XqLfIV8MJzy9zi5OOH9XYlXDOO3nY,579
+novel_downloader/core/downloaders/yamibo.py,sha256=oV4VpwCMtvWdEfDUijozId-LRZPlZkLlnkyyLx7_ZuM,583
 novel_downloader/core/exporters/__init__.py,sha256=ATkkdh6RUIaM19mG1XjFiaMnGRgFFGT3ixsqVkU13Q0,867
 novel_downloader/core/exporters/base.py,sha256=duIdLnj9kKNZ9r2aJV0Rzl-rnQCP8olk12uzduT9PtE,6146
 novel_downloader/core/exporters/biquge.py,sha256=SJCChYtDLJKrOpwDCT8IeR0v1LoiUQuTTejfGmRnxX8,462
@@ -38,13 +38,13 @@ novel_downloader/core/exporters/linovelib/epub.py,sha256=yVqv-lnc7Nh-COd4POvQ0vb
 novel_downloader/core/exporters/linovelib/main_exporter.py,sha256=cHkAp_jdF6uji5Avu1l8z6mR0nSrWYgX6ETDEezkjoE,3700
 novel_downloader/core/exporters/linovelib/txt.py,sha256=ALlZUl5nNtg4OmYlurMC0acjmTOBV7G8c13DPrxbG4w,4407
 novel_downloader/core/factory/__init__.py,sha256=_IY3N35onhWD_nw_TyxKOxa6e7Uak9Cv0bp4pK9yb0M,464
-novel_downloader/core/factory/downloader.py,sha256=hNCp3IlZQzeTSLBMuO_Y_EzrAn9_-8SLBHcUwMw8ijM,2060
+novel_downloader/core/factory/downloader.py,sha256=M3yGIdHhthYdvUmXP-jJiVojmBcOf293q5YftgjWzfg,1923
 novel_downloader/core/factory/exporter.py,sha256=CjDJGnWBDk-S1zYntIDAEo1hLM2q55tlJOjTXKn0hAI,1533
 novel_downloader/core/factory/fetcher.py,sha256=stfRJnh5ZXLqRsDtQC1BDeTe0yaZI-mgm3Qx03nWUP4,2402
 novel_downloader/core/factory/parser.py,sha256=0PXepJhlE6aGs9_t81vyho1eCw84-6XRBGb98_phvSQ,2237
 novel_downloader/core/fetchers/__init__.py,sha256=C1OykEdCzj3fpLRRhVrvwClpzz-pzTzTilH306crgYg,1440
 novel_downloader/core/fetchers/base/__init__.py,sha256=p9be-q2YjiHcQhv4_KMeZmHgaAYYyUDWoBo6Gvwughc,224
-novel_downloader/core/fetchers/base/browser.py,sha256=oR3ZMw71_LJrgTZXduVtZuXEkr7PZ9nxlS5ZlYavN_0,11153
+novel_downloader/core/fetchers/base/browser.py,sha256=6bXhCLc4hxzQgCoEoMspAY1Hn3TT1hjQNIJX0CSNzgw,11927
 novel_downloader/core/fetchers/base/rate_limiter.py,sha256=zUYH_PjnKfUzJpcbUPtMkwXxIlF0SH-ZTFlbCUrq060,2724
 novel_downloader/core/fetchers/base/session.py,sha256=Elfpov2cqojunCrLaaSL9ZgWLNVanUDZvgOoIfk5sSc,13251
 novel_downloader/core/fetchers/biquge/__init__.py,sha256=9EW4eerGeob4QGoDr11A8Mv7xvcfWVFU57M3VT9vzPI,236
@@ -54,7 +54,7 @@ novel_downloader/core/fetchers/common/__init__.py,sha256=ur_zQHrmJdPsFvpyC8AWjsZ
 novel_downloader/core/fetchers/common/browser.py,sha256=RgNOizfgi_59Xaee6lTlpfiCMGjz_4luNDlHLQqUpl0,2289
 novel_downloader/core/fetchers/common/session.py,sha256=Ydtwun9lPN4VEIIEIA7Skm6_GOiF_9VDUPkjGQQTdtM,2299
 novel_downloader/core/fetchers/esjzone/__init__.py,sha256=Cr30WpKEnCrG_vVqttfI9T0zdkwDsLFOnCxQz4EAQQA,242
-novel_downloader/core/fetchers/esjzone/browser.py,sha256=SPvbKURw2DkUAlOBLbklmRCFvDoI4tAUDwmBRo2Kuc8,6224
+novel_downloader/core/fetchers/esjzone/browser.py,sha256=bs9o97FRbtx8VSp1AfS0sljD0Izc16JDWqB_EL6GHT4,6278
 novel_downloader/core/fetchers/esjzone/session.py,sha256=hwvS9LMWm5PYHTTZqYkBgWqkVqkrCfQcaFh6NBICt1Q,7218
 novel_downloader/core/fetchers/linovelib/__init__.py,sha256=sMNXSBvn8gaZxNX5x4Ork8RzXxL7PhuigquWx6zQ6A4,254
 novel_downloader/core/fetchers/linovelib/browser.py,sha256=9rQzmJwtu_FHDDQvgDrVIZdwHA7CjnBkIgdyBuy7X50,6086
@@ -63,13 +63,13 @@ novel_downloader/core/fetchers/qianbi/__init__.py,sha256=h4Rve7fO1GcSJ-DlNC5zw7f
 novel_downloader/core/fetchers/qianbi/browser.py,sha256=1EmrSwpqSYhEO_ID3RJbUaAOhcqvVnMnch6iOafXbTA,3162
 novel_downloader/core/fetchers/qianbi/session.py,sha256=c3pJcgi9C1x9QYTBihvazHcgT7XTp2HBYfStTn6gSEg,3141
 novel_downloader/core/fetchers/qidian/__init__.py,sha256=2LshlX82lFpWZMV6yujHsfue9KM0-F1O3HvMCopIv9M,236
-novel_downloader/core/fetchers/qidian/browser.py,sha256=cUgJMrFe_MITHh4MGrDI2-a-MCqXSsoeJsbDus0l2LY,10448
-novel_downloader/core/fetchers/qidian/session.py,sha256=WrHsov15PoRDYbb1ZRaScJQGRZv6axz9_hVEC1Wt1PM,9746
+novel_downloader/core/fetchers/qidian/browser.py,sha256=0L2iUyOlFNmgKtSb89VMrF7L-MjiJy4E6SSKWxzeSC8,10448
+novel_downloader/core/fetchers/qidian/session.py,sha256=dsawkalQGjbS-E9lcOZMTr9qZz6w__gnmAg-uRUtDKI,9809
 novel_downloader/core/fetchers/sfacg/__init__.py,sha256=bQAIwERsX9XOKrP2LteFKX8Jlhw4oeUNwpZTHXn5RRg,230
 novel_downloader/core/fetchers/sfacg/browser.py,sha256=15PVS75PxEKR5W7mQbqVxoN0d4V1XVYVF0l1yy_sv_Y,5681
 novel_downloader/core/fetchers/sfacg/session.py,sha256=9K4emQCRq45vzYn-ZDX549tK2F92x2CBMp4ODohNOjc,5085
 novel_downloader/core/fetchers/yamibo/__init__.py,sha256=5ds6DNNvpo6F6U5dboEaIsJoKSPorkPte_HWVnXMdXo,236
-novel_downloader/core/fetchers/yamibo/browser.py,sha256=7YRrWbA8_cOcT_z-VjMWP6FUg30TwV6eLW4zJZ_UxSE,7249
+novel_downloader/core/fetchers/yamibo/browser.py,sha256=rkLgIIxLeFV2r4oAT0pOgiKgnp9HJ6X_fwfQIShhgj0,7265
 novel_downloader/core/fetchers/yamibo/session.py,sha256=434EArdKgEYIBZkb1nMub3PQXdRTS-Ov2_1u9MESjOs,7212
 novel_downloader/core/interfaces/__init__.py,sha256=hB1SjBzuN7qnZx_h3RV4w_roj3ZwShbIG3CV9jGMB14,602
 novel_downloader/core/interfaces/downloader.py,sha256=H0S4o5MW22JcvNVECv1bCdwAN0drBwHY31IbvVHn-X0,1557
@@ -90,14 +90,14 @@ novel_downloader/core/parsers/linovelib/main_parser.py,sha256=LqC6W-Lk7sdbiqhYvq
 novel_downloader/core/parsers/qianbi/__init__.py,sha256=CNmoER8U2u4-ix5S0DDq-pHTtkLR0IZf2SLaTTYXee4,173
 novel_downloader/core/parsers/qianbi/main_parser.py,sha256=kMjGew_dmqjI9oIThyHgxThZZgS3IaESB_tNf1nkCKk,5069
 novel_downloader/core/parsers/qidian/__init__.py,sha256=fWWFeyythX0gpDCJ-2AslrRl2hq4vW2bx9hHh1W7mAw,173
-novel_downloader/core/parsers/qidian/book_info_parser.py,sha256=h5oAVJOOSZMV4U2GnSezVHPJOEUKUic_oD2gl94mEPQ,3721
-novel_downloader/core/parsers/qidian/chapter_encrypted.py,sha256=VhPDERJq1ROJaBlaJuCXJGffisOxkeYFDUKXHo31HfU,18263
-novel_downloader/core/parsers/qidian/chapter_normal.py,sha256=6mD86OalpxiCDhjzUjcfFYsgmnTRU_rMIgFN8_Ceu50,4453
+novel_downloader/core/parsers/qidian/book_info_parser.py,sha256=TbP8nghoxzBi435cSJKAzWttBRUq49MHw6kn0klfZrU,3056
+novel_downloader/core/parsers/qidian/chapter_encrypted.py,sha256=uIVmRH96O_G0hcvg2nufUQDrZzq_XRhfvB_8YRW22g8,18532
+novel_downloader/core/parsers/qidian/chapter_normal.py,sha256=CClt6zVph7qjZ0HaiYzMPYlcFgnPIY783-SLVIXNL7E,4738
 novel_downloader/core/parsers/qidian/chapter_router.py,sha256=foVMlWtE-qUOvJD_4EDiuAVaNkFdeV_ZTCvS5IL7Orc,1957
-novel_downloader/core/parsers/qidian/main_parser.py,sha256=SPU6sUO8e4Gp_1q2WypuUQYEyHhoXM7OiRsthhFT6SM,4396
-novel_downloader/core/parsers/qidian/utils/__init__.py,sha256=HfjXrGAwH_ceRSE4m88Dl9qb7vHMGcPFxxTU3qrTld8,548
+novel_downloader/core/parsers/qidian/main_parser.py,sha256=jeo7Ypnf-tsBGucjBYBdPzXGd8N4N2eOERuHREloT0o,4504
+novel_downloader/core/parsers/qidian/utils/__init__.py,sha256=-7-nNMtX-KONSN3Q6-f3Yaxt9Oc3Y63kg5ZvNl6xlkY,588
 novel_downloader/core/parsers/qidian/utils/decryptor_fetcher.py,sha256=8ytJnAfiJIxj0wlke9UwYA6vngUyLxVZt8PbfkNUhss,4687
-novel_downloader/core/parsers/qidian/utils/helpers.py,sha256=-7vd1BMu5pVFCRySfPWyrItVbZ2wrHPNY8iAQEP7T_8,3264
+novel_downloader/core/parsers/qidian/utils/helpers.py,sha256=v64zTDQ6qbKnGXM7MPzCsS7yQ-w730vPVrDD19Bgx4Q,3514
 novel_downloader/core/parsers/qidian/utils/node_decryptor.py,sha256=gjqirr5RECScFw0C6DET7ZMaLTcqGcPOmlkwFUJbTHQ,5965
 novel_downloader/core/parsers/sfacg/__init__.py,sha256=O2nscvtOweMXHMONdvySTsLSy1ulhv53WTp4r6J47tI,169
 novel_downloader/core/parsers/sfacg/main_parser.py,sha256=yW18MALAZisJdFO-7peI1h-4XVloEDXeCJvXUz5hJ1A,5899
@@ -108,12 +108,12 @@ novel_downloader/locales/zh.json,sha256=7kkKGt1fudSC9LvmFyAgXfyCC512XfCoyf5by8Eg
 novel_downloader/models/__init__.py,sha256=5aQ24IeU8OJDhBZdZ8Ov-xWoLlZm6Qg24r5FPyLTa6Q,1102
 novel_downloader/models/browser.py,sha256=ly-jM7izQ77yTIG-oau51HJofDpBfrXpIJZJjoQyad8,435
 novel_downloader/models/chapter.py,sha256=bdAQUDZIuuTVxoYjoOJrbS2u81b1B2mkuZkTSf0m2HQ,492
-novel_downloader/models/config.py,sha256=fYExgkyylDuCUUW8nTFQLBX2rotiumvKV6uMZF1G5Ig,2981
+novel_downloader/models/config.py,sha256=mFrGZALhZzalWn9wtgRdwGnmgwh6xE0dXAaO7mFIrRc,3013
 novel_downloader/models/login.py,sha256=sY2Jom6PLpA9Z3Uy7plZKhda3Gq7awKOOIIaQ79PpWs,371
 novel_downloader/models/site_rules.py,sha256=kzDB5F8lf4udAO0WVUrgBOR7ave3jsMBxt7cEoG0bnI,2721
 novel_downloader/models/tasks.py,sha256=e4DYEXQQQewgQyCCHfc0UYnkPJ96LafmhG3oO5MQP0Q,465
 novel_downloader/models/types.py,sha256=q1KDuGW0SVxQILKKoPXKRecfaKe2m8jUM0nyaeDJ6dE,394
-novel_downloader/resources/config/settings.toml,sha256=A2B_EMh0zjTLi6UBCjhX__igz7xLCXnCqDzJMhiZn8E,4491
+novel_downloader/resources/config/settings.toml,sha256=gp5RrnSHJmnvrx75QwFxadKZVLWh8mnCy99aCwqirdQ,4580
 novel_downloader/resources/css_styles/main.css,sha256=WM6GePwdOGgM86fbbOxQ0_0oerTBDZeQHt8zRVfcJp8,1617
 novel_downloader/resources/css_styles/volume-intro.css,sha256=6gaUnNKkrb2w8tYJRq1BGD1FwbhT1I5W2GI_Zelo9G4,1156
 novel_downloader/resources/images/volume_border.png,sha256=2dEVimnTHKOfLMhi7bhkh_5joWNnrqg8duomLSNOZx4,28613
@@ -125,8 +125,8 @@ novel_downloader/tui/__init__.py,sha256=8RB8tBrPcoBzm1tpQlgZqnOZXrdHmlzMRxuk9wsN
 novel_downloader/tui/app.py,sha256=ytV1u15nGCRj_ff_GeAL3W1XlU6r5Lh_k3HBcAjPRx0,731
 novel_downloader/tui/main.py,sha256=MBP8SrwEYTpGQm-V9W_4rKnTeslneORfkzFsU3Xj2yA,256
 novel_downloader/tui/screens/__init__.py,sha256=QsUM5cUEKm7nluQh9acEt37xRWbkZU3vqIpBduepDCU,203
-novel_downloader/tui/screens/home.py,sha256=izxzn9Aru_fzenEKI9sOY1FNhyWky9zgzv7GVUMoW_8,6736
-novel_downloader/tui/screens/login.py,sha256=eEVmQFZKQX8mCt_qp96QK8t2pB15FeUrk_oV3jm_Mz4,2224
+novel_downloader/tui/screens/home.py,sha256=nH3pRuCOFcSvNV4AYC6RRkWpphmRgY1bNK36OkSVfCg,6994
+novel_downloader/tui/screens/login.py,sha256=GK8dXCtH5lGu3ilT1Cv2VmFCwHMspDNpzw0logj2lz0,2225
 novel_downloader/tui/styles/home_layout.tcss,sha256=VNJs339qiwNUuqwwdK6VkYThCdsqlw-2mEoZVCspdrw,974
 novel_downloader/tui/widgets/richlog_handler.py,sha256=bhFb0E7Z7-dRS07y_vMjxjPeCic9AD59MFPLhef_R5g,572
 novel_downloader/utils/__init__.py,sha256=4iUXNUzxeAnGmpGWsB4K_jckUYEW0u_LqWp_OM7mtK8,78
@@ -139,7 +139,6 @@ novel_downloader/utils/hash_store.py,sha256=HfzthzcKbHbVaHNpqjaAs2wDeq7iIeY8Mzkt
 novel_downloader/utils/hash_utils.py,sha256=7eC7WsO_kl25OnRYWzIXbCXsewxvCcvRCzetsf-wbTo,3023
 novel_downloader/utils/i18n.py,sha256=pdAcSIA5Tp-uPEBwNByHL7C1NayTnpOsl7zFv9p2G1k,1033
 novel_downloader/utils/logger.py,sha256=9h1iFS8_auiquNgOBd-Q2pbbcnAhAKL39yf3PKadu00,3339
-novel_downloader/utils/model_loader.py,sha256=JKgRFrr4HlAW9zuDUBAuuo_Kk_T_g9dWiU8E3zYk0vo,1996
 novel_downloader/utils/network.py,sha256=W0SVr55MSUjTmMPkUvvkH10SRgFx3GWrCN_fDavfk4A,9143
 novel_downloader/utils/state.py,sha256=FcNJ85GvBu7uEIjy0QHGr4sXMbHPEMkCjwUKNg5EabI,5132
 novel_downloader/utils/file_utils/__init__.py,sha256=zvOm2qSEmWd_mRGJceGBZb5MYMSDAlWYjS5MkVQNZgI,1159
@@ -147,19 +146,20 @@ novel_downloader/utils/file_utils/io.py,sha256=AZ3NUe6lifGsYt3iYyXyQ2BO41WV8j013
 novel_downloader/utils/file_utils/normalize.py,sha256=MrsCq4FqmskKRkHRV_J0z0dmn69OerMum-9sqx2XOGM,2023
 novel_downloader/utils/file_utils/sanitize.py,sha256=rE-u4vpDL10zH8FT8d9wqwWsz-7dR6PJ-LE45K8VaeE,2112
 novel_downloader/utils/fontocr/__init__.py,sha256=fe-04om3xxBvFKt5BBCApXCzv-Z0K_AY7lv9IB1jEHM,543
-novel_downloader/utils/fontocr/ocr_v1.py,sha256=bwkvqKXUcKsgBCrag8jHuIl8AOM_MbV28ZSQ_aO_X6s,11245
-novel_downloader/utils/fontocr/ocr_v2.py,sha256=OJ_egORHa9KwVJX4kEABR25D7RRF0jVCRV4WgHUal7M,27307
-novel_downloader/utils/text_utils/__init__.py,sha256=JQtEnJ22K9o_syY5PV4Bf_p4BKZonX5g9-A5eqlxpZs,806
+novel_downloader/utils/fontocr/model_loader.py,sha256=aBPZlwZ-rx2tDsWtN3BnB15vceqNkqTEBX1h2pMZf3E,2012
+novel_downloader/utils/fontocr/ocr_v1.py,sha256=S8GAuDUiVv3mciQvgHEibAhJ2DIow6bHs_ZSYvboC4c,11224
+novel_downloader/utils/fontocr/ocr_v2.py,sha256=XiTHNeRcCw4Q441Tfdox6Sq91dHPfUYg5MecO8qfcB8,27286
+novel_downloader/utils/text_utils/__init__.py,sha256=tAO8oCryMAwQoCCpTKaLJagQ6UK8tJXU55MYomWI-6c,913
 novel_downloader/utils/text_utils/chapter_formatting.py,sha256=WAAEAcI7zI_uIeARDybZfXDdMvGio3VIkANFrK8-8Os,1378
 novel_downloader/utils/text_utils/diff_display.py,sha256=aUvjMcYO-1_P8ZYiYbmYbJOByKo2bWoBV_ifRuAqwb8,2528
 novel_downloader/utils/text_utils/font_mapping.py,sha256=Aos5skBhowDdPgnYmK0bpLtNm2hZg3RolNlTkxC9kO8,865
-novel_downloader/utils/text_utils/text_cleaning.py,sha256=_Nahr8iv3341IyDXW-KpTn4XNG2hB-HajSM52pysPu8,1630
+novel_downloader/utils/text_utils/text_cleaning.py,sha256=zufXt0pc0vnUwgSHD_8LAef3ffqmX9rJ11YzW4rgwLA,2940
 novel_downloader/utils/time_utils/__init__.py,sha256=725vY2PvqFhjbAz0hCOuIuhSCK8HrEqQ_k3YwvubmXo,624
-novel_downloader/utils/time_utils/datetime_utils.py,sha256=1eyX8lTEqkQ-rEej_GrhbUpaIR5tsFdVSKT-q8s9X-g,4927
+novel_downloader/utils/time_utils/datetime_utils.py,sha256=3sPdUjDC7Y7dcX6kaQSBu49BU1tnpERNKq0v9lnD170,4932
 novel_downloader/utils/time_utils/sleep_utils.py,sha256=C4XYeAtxoVZC9Ju6vhhP9sbOrSpdZG2Nm-x1IYO_OFA,3233
-novel_downloader-1.4.2.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
-novel_downloader-1.4.2.dist-info/METADATA,sha256=ogSqUunbmTtsABDdShe_XYxGYLPqyvGnmwKyuAJ82bI,7151
-novel_downloader-1.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-novel_downloader-1.4.2.dist-info/entry_points.txt,sha256=u1Ns5xI_QJyL4HAFCgJvJdib9ugu7M9I2tnQwZjJxrk,112
-novel_downloader-1.4.2.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
-novel_downloader-1.4.2.dist-info/RECORD,,
+novel_downloader-1.4.4.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
+novel_downloader-1.4.4.dist-info/METADATA,sha256=JrEV-At77txIIajUrfOix5WYcMVvRkhjf5h601ozbVg,7253
+novel_downloader-1.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+novel_downloader-1.4.4.dist-info/entry_points.txt,sha256=u1Ns5xI_QJyL4HAFCgJvJdib9ugu7M9I2tnQwZjJxrk,112
+novel_downloader-1.4.4.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
+novel_downloader-1.4.4.dist-info/RECORD,,