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

novel_downloader/core/interfaces/downloader.py

@@ -10,45 +10,46 @@ that outlines the expected behavior of any downloader class.
 from collections.abc import Awaitable, Callable
 from typing import Any, Protocol, runtime_checkable
 
+from novel_downloader.models import BookConfig
+
 
 @runtime_checkable
 class DownloaderProtocol(Protocol):
     """
-    Protocol for fully-asynchronous downloader classes.
+    Protocol for async downloader implementations.
 
-    Defines the expected interface for any downloader implementation,
-    including both batch and single book downloads,
-    as well as optional pre-download hooks.
+    Uses BookConfig (with book_id, optional start_id/end_id/ignore_ids)
+    for both single and batch downloads.
     """
 
     async def download(
         self,
-        book_id: str,
+        book: BookConfig,
         *,
         progress_hook: Callable[[int, int], Awaitable[None]] | None = None,
         **kwargs: Any,
     ) -> None:
         """
-        Download logic for a single book.
+        Download a single book.
 
-        :param book_id: The identifier of the book.
-        :param progress_hook: (optional) Called after each chapter;
+        :param book: BookConfig with at least 'book_id'.
+        :param progress_hook: Optional async callback after each chapter.
                                 args: completed_count, total_count.
         """
         ...
 
     async def download_many(
         self,
-        book_ids: list[str],
+        books: list[BookConfig],
         *,
         progress_hook: Callable[[int, int], Awaitable[None]] | None = None,
         **kwargs: Any,
     ) -> None:
         """
-        Batch download entry point.
+        Download multiple books.
 
-        :param book_ids: List of book IDs to download.
-        :param progress_hook: (optional) Called after each chapter;
+        :param books: List of BookConfig entries.
+        :param progress_hook: Optional async callback after each chapter.
                                 args: completed_count, total_count.
         """
         ...

novel_downloader/locales/en.json

@@ -66,6 +66,8 @@
   "download_downloading": "Downloading book {book_id} from {site}...",
   "download_prompt_parse": "Parse...",
   "download_book_ids": "One or more book IDs to process",
+  "download_option_start": "Start chapter ID (applies to the first book ID only)",
+  "download_option_end": "End chapter ID (applies to the first book ID only)",
   "login_description": "Description",
   "login_hint": "Hint",
   "login_manual_prompt": ">> Please complete login in your browser and press Enter to continue...",

novel_downloader/locales/zh.json

@@ -66,6 +66,8 @@
   "download_downloading": "正在从 {site} 下载书籍 {book_id}...",
   "download_prompt_parse": "结束...",
   "download_book_ids": "要处理的一个或多个小说 ID",
+  "download_option_start": "起始章节 ID (仅用于第一个书籍 ID)",
+  "download_option_end": "结束章节 ID (仅用于第一个书籍 ID)",
   "login_description": "说明",
   "login_hint": "提示",
   "login_manual_prompt": ">> 请在浏览器中完成登录后按回车继续...",

novel_downloader/models/__init__.py

@@ -8,6 +8,7 @@ novel_downloader.models
 from .browser import NewContextOptions
 from .chapter import ChapterDict
 from .config import (
+    BookConfig,
     DownloaderConfig,
     ExporterConfig,
     FetcherConfig,
@@ -39,6 +40,7 @@ from .types import (
 
 __all__ = [
     "NewContextOptions",
+    "BookConfig",
     "DownloaderConfig",
     "ParserConfig",
     "FetcherConfig",

novel_downloader/models/config.py

@@ -17,6 +17,7 @@ strongly typed Python objects for safer and cleaner access.
 """
 
 from dataclasses import dataclass
+from typing import NotRequired, TypedDict
 
 from .types import (
     BrowserType,
@@ -98,3 +99,10 @@ class ExporterConfig:
     include_toc: bool = False
     include_picture: bool = False
     split_mode: SplitMode = "book"
+
+
+class BookConfig(TypedDict):
+    book_id: str
+    start_id: NotRequired[str]
+    end_id: NotRequired[str]
+    ignore_ids: NotRequired[list[str]]

novel_downloader/tui/screens/home.py

@@ -106,12 +106,12 @@ class HomeScreen(Screen):  # type: ignore[misc]
         self,
         adapter: ConfigAdapter,
         site: str,
-        valid_book_ids: set[str],
+        book_ids: set[str],
     ) -> None:
         btn = self.query_one("#download", Button)
         btn.disabled = True
         try:
-            logging.info(f"下载请求: {site} | {valid_book_ids}")
+            logging.info(f"下载请求: {site} | {book_ids}")
             downloader_cfg = adapter.get_downloader_config()
             fetcher_cfg = adapter.get_fetcher_config()
             parser_cfg = adapter.get_parser_config()
@@ -139,10 +139,11 @@ class HomeScreen(Screen):  # type: ignore[misc]
                     config=downloader_cfg,
                 )
 
-                for book_id in valid_book_ids:
+                for book_id in book_ids:
                     logging.info(t("download_downloading", book_id=book_id, site=site))
                     await downloader.download(
-                        book_id, progress_hook=self._update_progress
+                        {"book_id": book_id},
+                        progress_hook=self._update_progress,
                     )
 
                 if downloader_cfg.login_required and fetcher.is_logged_in:

novel_downloader/utils/constants.py

@@ -116,35 +116,6 @@ QD_DECRYPT_SCRIPT_PATH = files("novel_downloader.resources.js_scripts").joinpath
 # Text Files
 BLACKLIST_PATH = files("novel_downloader.resources.text").joinpath("blacklist.txt")
 
-# -----------------------------------------------------------------------------
-# EPUB defaults
-# -----------------------------------------------------------------------------
-EPUB_IMAGE_FOLDER = "Images"
-EPUB_TEXT_FOLDER = "Text"
-
-EPUB_IMAGE_WRAPPER = (
-    '<div class="duokan-image-single illus"><img src="../Images/{filename}" /></div>'
-)
-
-EPUB_OPTIONS = {
-    # guide 是 EPUB 2 的一个部分, 包含封面, 目录, 索引等重要导航信息
-    "epub2_guide": True,
-    # landmark 是 EPUB 3 用来标识重要页面 (如目录, 封面, 起始页) 的 <nav> 结构
-    "epub3_landmark": True,
-    # EPUB 3 允许提供一个 page list, 让电子书在不同设备上仍然保持相对一致的分页结构
-    "epub3_pages": True,
-    # 这个名字会出现在 EPUB 阅读器的导航栏
-    "landmark_title": "Guide",
-    # 这个名字会显示在 EPUB 阅读器的分页导航栏
-    "pages_title": "Pages",
-    # 是否根据 book.spine 的排列顺序自动设置 EPUB 阅读器的 page-progression-direction
-    "spine_direction": True,
-    # 控制 EPUB 阅读器的默认翻页方向 (LTR 或 RTL)
-    "package_direction": False,
-    # 是否为 EPUB 书籍中的章节 添加播放顺序
-    "play_order": {"enabled": True, "start_from": 1},
-}
-
 # ---------------------------------------------------------------------
 # Pretrained model registry (e.g. used in font recovery or OCR)
 # ---------------------------------------------------------------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.4.0
+Version: 1.4.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
@@ -46,7 +46,6 @@ Requires-Dist: aiohttp
 Requires-Dist: playwright
 Requires-Dist: lxml
 Requires-Dist: platformdirs
-Requires-Dist: ebooklib
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
@@ -55,6 +54,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
+Requires-Dist: types-lxml; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: commitizen; extra == "dev"
@@ -109,6 +109,8 @@ playwright install
 pip install novel-downloader[font-recovery]
 ```
 
+- 详细可见: [安装](https://github.com/BowenZ217/novel-downloader/blob/main/docs/1-installation.md)
+
 ---
 
 ### CLI 模式

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

@@ -1,45 +1,40 @@
-novel_downloader/__init__.py,sha256=TLa2eWlJhpY9lBjsolzhKpaZ7PWwhQj34Tj7RUSLlOY,218
+novel_downloader/__init__.py,sha256=qYZxJQ-xYLPTjMwE7FYcQM5HYV9Oo_bqCJY55hAqlcE,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=HKCxufqnj4vDzCdM7soH_Y_eiVNRGpV17Mz08ADYwqQ,5279
+novel_downloader/cli/download.py,sha256=ff2KMsa9XnbsF_aUQcAc7a06hDYmk4-7yMv4iiXTWlI,6762
 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=UYtDlpKFcKmvBBN9ZOI3W7u0a72Fhrpk-DkZmKoKpqk,7281
+novel_downloader/config/adapter.py,sha256=hPRAomAlqhyUlNemm82e4m0SAYa33woulb5ePHMRC3o,8330
 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/downloaders/__init__.py,sha256=AK5zeetVXOn_irgHp-NORPYW65UJM4CsF8ysxf2vKD4,1064
-novel_downloader/core/downloaders/base.py,sha256=H3Y9NnSv4lQA6ilKCd7HqAX24R79wXBMkLG5StK8znc,6420
+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=1YNo-e5tuK5bGvuzX3eVmEJznD7f5JMo7a_abIdmEkM,15504
+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=YrX5HdJDopEjc1kvEJRjMc1S4iR049IGvzUNtgE-LPE,12590
+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/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
+novel_downloader/core/exporters/epub_util.py,sha256=uSMB_55v6xKJcKyFjJZghl0ZgCFsdGbJJHH22G-BkeQ,37377
 novel_downloader/core/exporters/esjzone.py,sha256=UP9gtTOv6komWjgvwXkttqDYJJPjjbJdiG3yz9RxHSQ,467
 novel_downloader/core/exporters/qianbi.py,sha256=x841MNIxpS5eY8u91ODC0cpIhpT-ENnFqs_Yx6HwtdM,462
 novel_downloader/core/exporters/qidian.py,sha256=ecaZcgqXyLvJtT2J5QXw4qS9gY3d72mgUnV-0frJvhQ,724
 novel_downloader/core/exporters/sfacg.py,sha256=j4_H-ixvDxd_OJfIvD4Lbs24LaiFjaYqhvhZcks-ItI,457
 novel_downloader/core/exporters/yamibo.py,sha256=QaY13llqpyxIgmMnMVFtR5yFMIpyMHHdCmVDW4Dq-bo,462
 novel_downloader/core/exporters/common/__init__.py,sha256=qIOZ_TgnnQZ6p45YQsxpTcB69e0Jq9XMG3IY0NBVsTM,274
-novel_downloader/core/exporters/common/epub.py,sha256=1BhaZCZLehX-v8Z7spatyizhHoMfCF08ZfZGpPfB5Kw,6331
+novel_downloader/core/exporters/common/epub.py,sha256=_hFoc3aVRf7xxrWCvukN7Iv5ulYbkSq53nQMfaZb75E,8833
 novel_downloader/core/exporters/common/main_exporter.py,sha256=-MRZEpAdsfdRt3VxIv4krMaw2UJnrvCnyj5Jde93zuA,3926
 novel_downloader/core/exporters/common/txt.py,sha256=b5cNvH0hrjaBO89Uddn1IUY1BFhkHJdTd7WjSWk4ndk,4719
-novel_downloader/core/exporters/epub_utils/__init__.py,sha256=cPtuQDtuJZPgOHRf_T5sgkQE13jZnOyPoK9hHJeMEEo,993
-novel_downloader/core/exporters/epub_utils/css_builder.py,sha256=qvVgHnyoILgqSUoVsHv-cHzIdtfsqxA8WHt9_89puic,2145
-novel_downloader/core/exporters/epub_utils/image_loader.py,sha256=hbxoPvXkBIZnoZSIlHwIUx4zWR8QVppWiH1KotMrBXg,3953
-novel_downloader/core/exporters/epub_utils/initializer.py,sha256=TGueFff1ydRLdJYBEJnqIkoVCV57ZiR3dGu_c5Hrp8g,3364
-novel_downloader/core/exporters/epub_utils/text_to_html.py,sha256=VSYbm33PrwxFmcT-2f_U2j3kuHzdcSMR7PRqOWvZICU,5617
-novel_downloader/core/exporters/epub_utils/volume_intro.py,sha256=cwHMVwJeK8TzXnOw4MYWXvbZGt4iWFjdesDm4n_V-Tk,1830
 novel_downloader/core/exporters/linovelib/__init__.py,sha256=zD7A7OhluipwICssnp27c_oenYozevZH9g0Qj5WOMWY,195
-novel_downloader/core/exporters/linovelib/epub.py,sha256=wxfNxOX6kxSaove-YlDlNw1cmsBJFwysk6bS6Gsk8Cw,14503
+novel_downloader/core/exporters/linovelib/epub.py,sha256=yVqv-lnc7Nh-COd4POvQ0vbsAw18NJ8oFO88-zKedb4,13048
 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
@@ -62,13 +57,13 @@ novel_downloader/core/fetchers/esjzone/__init__.py,sha256=Cr30WpKEnCrG_vVqttfI9T
 novel_downloader/core/fetchers/esjzone/browser.py,sha256=SPvbKURw2DkUAlOBLbklmRCFvDoI4tAUDwmBRo2Kuc8,6224
 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=pXasjPCG18CXmWkXFh7Uw24HNlTiocSup5tKK42YGck,5515
-novel_downloader/core/fetchers/linovelib/session.py,sha256=y-R2FzKf0dpffUATI-xTKvq1S2wvQWA50H1avuqUrGM,5525
+novel_downloader/core/fetchers/linovelib/browser.py,sha256=9rQzmJwtu_FHDDQvgDrVIZdwHA7CjnBkIgdyBuy7X50,6086
+novel_downloader/core/fetchers/linovelib/session.py,sha256=2BpYe7kqIhHLbrH6Lk4TA4f8d_OHVO6lxHzZ-VVuG30,6096
 novel_downloader/core/fetchers/qianbi/__init__.py,sha256=h4Rve7fO1GcSJ-DlNC5zw7fjoldJy4chG9RZQf5DuCU,236
 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=JuFncpirI4HLyfIkR0xZmHL6AZZy7tQOzkzsC24b9ss,8578
+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/sfacg/__init__.py,sha256=bQAIwERsX9XOKrP2LteFKX8Jlhw4oeUNwpZTHXn5RRg,230
 novel_downloader/core/fetchers/sfacg/browser.py,sha256=15PVS75PxEKR5W7mQbqVxoN0d4V1XVYVF0l1yy_sv_Y,5681
@@ -77,7 +72,7 @@ novel_downloader/core/fetchers/yamibo/__init__.py,sha256=5ds6DNNvpo6F6U5dboEaIsJ
 novel_downloader/core/fetchers/yamibo/browser.py,sha256=7YRrWbA8_cOcT_z-VjMWP6FUg30TwV6eLW4zJZ_UxSE,7249
 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=XozFf-7OOtBQDlWNs3IRcBjwTPGFWwseFLGta-sZZmU,1560
+novel_downloader/core/interfaces/downloader.py,sha256=H0S4o5MW22JcvNVECv1bCdwAN0drBwHY31IbvVHn-X0,1557
 novel_downloader/core/interfaces/exporter.py,sha256=zwIaJ5FXo_JmKYg2UZV9FTWX7xZ2e0QuL4RTNGRtI04,1610
 novel_downloader/core/interfaces/fetcher.py,sha256=XlP3d-Q_xvuVextZCdLOxDf8BwBbx799L_WLJx0WTB8,4096
 novel_downloader/core/interfaces/parser.py,sha256=iZeUgNl-zE-wsf1eW4GVCPjEaLSvQrNJi_mVEOU9ulY,1353
@@ -108,12 +103,12 @@ novel_downloader/core/parsers/sfacg/__init__.py,sha256=O2nscvtOweMXHMONdvySTsLSy
 novel_downloader/core/parsers/sfacg/main_parser.py,sha256=yW18MALAZisJdFO-7peI1h-4XVloEDXeCJvXUz5hJ1A,5899
 novel_downloader/core/parsers/yamibo/__init__.py,sha256=KJ_fCcakoQrsG36OOd0paXXB1cAIwMirKaA8ZLUKUKI,173
 novel_downloader/core/parsers/yamibo/main_parser.py,sha256=9sNXsDR2iDVyTYupP_7PyE7BXf2po3sZLq1XEFA8DrI,6554
-novel_downloader/locales/en.json,sha256=-bKxndkwJCTCt7ZZGRRKzNaulC7z8XB6Tu7T1SR-1S8,6840
-novel_downloader/locales/zh.json,sha256=xzbUsKtkdQvQkehTgIURlQMPepOSWbQBgzTJ4SSJNZc,6699
-novel_downloader/models/__init__.py,sha256=G5fYGdaFquJBcllFJ7-YgqkvP4vD3xVEI9MeYcrCr_s,1068
+novel_downloader/locales/en.json,sha256=mcGv24zHS2FFimwCYRLMD8CYzAzngTv1tODZP64GWvY,7002
+novel_downloader/locales/zh.json,sha256=7kkKGt1fudSC9LvmFyAgXfyCC512XfCoyf5by8Egqnc,6849
+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=d5G8sob9oNA8rr1N7BvDEJRVSCKJUtD_QBcvWZvGMyw,2792
+novel_downloader/models/config.py,sha256=fYExgkyylDuCUUW8nTFQLBX2rotiumvKV6uMZF1G5Ig,2981
 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
@@ -130,14 +125,14 @@ 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=ximy5vwHGrkUD88U6Gr9h3kT-wtOMMLBzB9aEZPuA5w,6716
+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/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
 novel_downloader/utils/cache.py,sha256=_jVEWAaMGY86kWVnAuuIvJA_hA8dH2ClI7o3p99mEvE,618
 novel_downloader/utils/chapter_storage.py,sha256=wXXIzNjs1GfPPoqgYYPnQ9Two23McW6ZZNDmhfSC9aY,9831
-novel_downloader/utils/constants.py,sha256=1emMOmGRuat0yX8ozZMM1pAUGdU0kYBhDVNW_6dDtps,5700
+novel_downloader/utils/constants.py,sha256=EaxQllQ_dIce5_eRTgAJ-OXRtEk3cMhLUbOKA359198,4435
 novel_downloader/utils/cookies.py,sha256=WuPBt_z7cF4n7QPIw1julATWt6dbDRCbNdgXHSikmjo,2042
 novel_downloader/utils/crypto_utils.py,sha256=BRlVR9Nvbu8TQXocJb3po1-kD5HkbCV0yyT84nq_XtI,2052
 novel_downloader/utils/hash_store.py,sha256=HfzthzcKbHbVaHNpqjaAs2wDeq7iIeY8Mzkt_4v80jQ,9388
@@ -162,9 +157,9 @@ novel_downloader/utils/text_utils/text_cleaning.py,sha256=_Nahr8iv3341IyDXW-KpTn
 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/sleep_utils.py,sha256=C4XYeAtxoVZC9Ju6vhhP9sbOrSpdZG2Nm-x1IYO_OFA,3233
-novel_downloader-1.4.0.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
-novel_downloader-1.4.0.dist-info/METADATA,sha256=iFXirg0_BDhczHRV37P5QgtbuUawakAx1kzY1aAfQeU,7027
-novel_downloader-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-novel_downloader-1.4.0.dist-info/entry_points.txt,sha256=u1Ns5xI_QJyL4HAFCgJvJdib9ugu7M9I2tnQwZjJxrk,112
-novel_downloader-1.4.0.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
-novel_downloader-1.4.0.dist-info/RECORD,,
+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/core/exporters/epub_utils/__init__.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-"""
-novel_downloader.core.exporters.epub_utils
-------------------------------------------
-
-This package provides utility functions for constructing EPUB files,
-including:
-
-- CSS inclusion (css_builder)
-- Image embedding (image_loader)
-- EPUB book initialization (initializer)
-- Chapter text-to-HTML conversion (text_to_html)
-- Volume intro HTML generation (volume_intro)
-"""
-
-from .css_builder import create_css_items
-from .image_loader import (
-    add_images_from_dir,
-    add_images_from_dirs,
-    add_images_from_list,
-)
-from .initializer import init_epub
-from .text_to_html import (
-    chapter_txt_to_html,
-    generate_book_intro_html,
-    inline_remote_images,
-)
-from .volume_intro import create_volume_intro
-
-__all__ = [
-    "create_css_items",
-    "add_images_from_dir",
-    "add_images_from_dirs",
-    "add_images_from_list",
-    "init_epub",
-    "chapter_txt_to_html",
-    "create_volume_intro",
-    "generate_book_intro_html",
-    "inline_remote_images",
-]

novel_downloader/core/exporters/epub_utils/css_builder.py

@@ -1,75 +0,0 @@
-#!/usr/bin/env python3
-"""
-novel_downloader.core.exporters.epub_utils.css_builder
-------------------------------------------------------
-
-Reads local CSS files and wraps them into epub.EpubItem objects,
-returning a list ready to be added to the EPUB.
-"""
-
-import logging
-from importlib.abc import Traversable
-from typing import TypedDict
-
-from ebooklib import epub
-
-from novel_downloader.utils.constants import (
-    CSS_MAIN_PATH,
-    CSS_VOLUME_INTRO_PATH,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class CssConfig(TypedDict):
-    include: bool
-    path: Traversable
-    uid: str
-    file_name: str
-
-
-def create_css_items(
-    include_main: bool = True,
-    include_volume: bool = True,
-) -> list[epub.EpubItem]:
-    """
-    :param include_main:   Whether to load the main stylesheet.
-    :param include_volume: Whether to load the “volume intro” stylesheet.
-    :returns: A list of epub.EpubItem ready to add to the book.
-    """
-    css_config: list[CssConfig] = [
-        {
-            "include": include_main,
-            "path": CSS_MAIN_PATH,
-            "uid": "style",
-            "file_name": "Styles/main.css",
-        },
-        {
-            "include": include_volume,
-            "path": CSS_VOLUME_INTRO_PATH,
-            "uid": "volume_style",
-            "file_name": "Styles/volume-intro.css",
-        },
-    ]
-    css_items: list[epub.EpubItem] = []
-
-    for css in css_config:
-        if css["include"]:
-            path = css["path"]
-            try:
-                content: str = path.read_text(encoding="utf-8")
-                content_bytes: bytes = content.encode("utf-8")
-                css_items.append(
-                    epub.EpubItem(
-                        uid=css["uid"],
-                        file_name=css["file_name"],
-                        media_type="text/css",
-                        content=content_bytes,
-                    )
-                )
-            except FileNotFoundError:
-                logger.info(f"[epub] CSS 文件不存在: {css['path']}")
-            except UnicodeDecodeError:
-                logger.info(f"[epub] 无法解码文件: {css['path']}")
-
-    return css_items

novel_downloader/core/exporters/epub_utils/image_loader.py

@@ -1,131 +0,0 @@
-#!/usr/bin/env python3
-"""
-novel_downloader.core.exporters.epub_utils.image_loader
--------------------------------------------------------
-
-Utilities for embedding image files into an EpubBook.
-"""
-
-import logging
-from collections.abc import Iterable, Sequence
-from pathlib import Path
-
-from ebooklib import epub
-
-from novel_downloader.utils.constants import EPUB_IMAGE_FOLDER
-
-logger = logging.getLogger(__name__)
-
-_SUPPORTED_IMAGE_MEDIA_TYPES: dict[str, str] = {
-    "png": "image/png",
-    "jpg": "image/jpeg",
-    "jpeg": "image/jpeg",
-    "gif": "image/gif",
-    "svg": "image/svg+xml",
-    "webp": "image/webp",
-}
-_DEFAULT_IMAGE_MEDIA_TYPE = "image/jpeg"
-
-
-def add_images_from_list(
-    book: epub.EpubBook,
-    image_list: Sequence[str | Path],
-) -> epub.EpubBook:
-    """
-    Add a list of image files to the EPUB's image folder.
-
-    :param book: The EpubBook object to modify.
-    :param image_list: List of paths to image files.
-    :return: The same EpubBook instance, with images added.
-    """
-    for img_path in image_list:
-        img_path = Path(img_path)
-        if not img_path.is_file():
-            continue
-
-        suffix = img_path.suffix.lower().lstrip(".")
-        media_type = _SUPPORTED_IMAGE_MEDIA_TYPES.get(suffix)
-        if media_type is None:
-            media_type = _DEFAULT_IMAGE_MEDIA_TYPE
-            logger.warning(
-                "Unknown image suffix '%s' - defaulting media_type to %s",
-                suffix,
-                media_type,
-            )
-
-        try:
-            content = img_path.read_bytes()
-            item = epub.EpubItem(
-                uid=f"img_{img_path.stem}",
-                file_name=f"{EPUB_IMAGE_FOLDER}/{img_path.name}",
-                media_type=media_type,
-                content=content,
-            )
-            book.add_item(item)
-            logger.debug("Embedded image: %s", img_path.name)
-        except Exception:
-            logger.exception("Failed to embed image %s", img_path)
-
-    return book
-
-
-def add_images_from_dir(
-    book: epub.EpubBook,
-    image_dir: str | Path,
-) -> epub.EpubBook:
-    """
-    Load every file in `image_dir` into the EPUB's image folder.
-
-    :param book: The EpubBook object to modify.
-    :param image_dir: Path to the directory containing image files.
-    :return: The same EpubBook instance, with images added.
-    """
-    image_dir = Path(image_dir)
-    if not image_dir.is_dir():
-        logger.warning("Image directory not found or not a directory: %s", image_dir)
-        return book
-
-    for img_path in image_dir.iterdir():
-        if not img_path.is_file():
-            continue
-
-        suffix = img_path.suffix.lower().lstrip(".")
-        media_type = _SUPPORTED_IMAGE_MEDIA_TYPES.get(suffix)
-        if media_type is None:
-            media_type = _DEFAULT_IMAGE_MEDIA_TYPE
-            logger.warning(
-                "Unknown image suffix '%s' - defaulting media_type to %s",
-                suffix,
-                media_type,
-            )
-
-        try:
-            content = img_path.read_bytes()
-            item = epub.EpubItem(
-                uid=f"img_{img_path.stem}",
-                file_name=f"{EPUB_IMAGE_FOLDER}/{img_path.name}",
-                media_type=media_type,
-                content=content,
-            )
-            book.add_item(item)
-            logger.debug("Embedded image: %s", img_path.name)
-        except Exception:
-            logger.exception("Failed to embed image %s", img_path)
-
-    return book
-
-
-def add_images_from_dirs(
-    book: epub.EpubBook,
-    image_dirs: Iterable[str | Path],
-) -> epub.EpubBook:
-    """
-    Add all images from multiple directories into the given EpubBook.
-
-    :param book: The EpubBook object to modify.
-    :param image_dirs: An iterable of directory paths to scan for images.
-    :return: The same EpubBook instance, with all images added.
-    """
-    for img_dir in image_dirs:
-        book = add_images_from_dir(book, img_dir)
-    return book