novel-downloader 1.4.2__tar.gz → 1.4.3__tar.gz

{novel_downloader-1.4.2 → novel_downloader-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.4.2
+Version: 1.4.3
 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 → novel_downloader-1.4.3}/README.md

@@ -111,6 +111,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 → novel_downloader-1.4.3}/novel_downloader/__init__.py

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

{novel_downloader-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2 → novel_downloader-1.4.3}/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-1.4.2/novel_downloader/utils → novel_downloader-1.4.3/novel_downloader/utils/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-1.4.2 → novel_downloader-1.4.3}/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__)