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

novel_downloader/__init__.py

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

novel_downloader/core/downloaders/common/common_async.py

@@ -20,7 +20,6 @@ from novel_downloader.core.interfaces import (
 )
 from novel_downloader.utils.chapter_storage import ChapterDict, ChapterStorage
 from novel_downloader.utils.file_utils import save_as_json, save_as_txt
-from novel_downloader.utils.network import download_image_as_bytes
 from novel_downloader.utils.time_utils import calculate_time_difference
 
 logger = logging.getLogger(__name__)
@@ -107,13 +106,6 @@ class CommonAsyncDownloader(BaseAsyncDownloader):
         else:
             book_info = json.loads(info_path.read_text("utf-8"))
 
-        # download cover
-        cover_url = book_info.get("cover_url", "")
-        if cover_url:
-            await asyncio.get_running_loop().run_in_executor(
-                None, download_image_as_bytes, cover_url, raw_base
-            )
-
         # setup queue, semaphore, executor
         semaphore = asyncio.Semaphore(self.download_workers)
         queue: asyncio.Queue[tuple[str, list[str]]] = asyncio.Queue()

novel_downloader/core/downloaders/common/common_sync.py

@@ -19,7 +19,6 @@ from novel_downloader.core.interfaces import (
 )
 from novel_downloader.utils.chapter_storage import ChapterStorage
 from novel_downloader.utils.file_utils import save_as_json, save_as_txt
-from novel_downloader.utils.network import download_image_as_bytes
 from novel_downloader.utils.time_utils import (
     calculate_time_difference,
     sleep_with_random_delay,
@@ -119,13 +118,6 @@ class CommonDownloader(BaseDownloader):
                 save_as_json(book_info, info_path)
             sleep_with_random_delay(wait_time, mul_spread=1.1, max_sleep=wait_time + 2)
 
-        # download cover
-        cover_url = book_info.get("cover_url", "")
-        if cover_url:
-            cover_bytes = download_image_as_bytes(cover_url, raw_base)
-            if not cover_bytes:
-                logger.warning("%s Failed to download cover: %s", TAG, cover_url)
-
         # enqueue chapters
         for vol in book_info.get("volumes", []):
             vol_name = vol.get("volume_name", "")

novel_downloader/core/downloaders/qidian/qidian_sync.py

@@ -19,7 +19,6 @@ from novel_downloader.core.interfaces import (
 )
 from novel_downloader.utils.chapter_storage import ChapterStorage
 from novel_downloader.utils.file_utils import save_as_json, save_as_txt
-from novel_downloader.utils.network import download_image_as_bytes
 from novel_downloader.utils.state import state_mgr
 from novel_downloader.utils.time_utils import (
     calculate_time_difference,
@@ -111,13 +110,6 @@ class QidianDownloader(BaseDownloader):
                 save_as_json(book_info, info_path)
             sleep_with_random_delay(wait_time, mul_spread=1.1, max_sleep=wait_time + 2)
 
-        # download cover
-        cover_url = book_info.get("cover_url", "")
-        if cover_url:
-            cover_bytes = download_image_as_bytes(cover_url, raw_base)
-            if not cover_bytes:
-                self.logger.warning("%s Failed to download cover: %s", TAG, cover_url)
-
         # enqueue chapters
         for vol in book_info.get("volumes", []):
             vol_name = vol.get("volume_name", "")

novel_downloader/core/parsers/esjzone/main_parser.py

@@ -85,9 +85,10 @@ class EsjzoneParser(BaseParser):
 
         _start_volume("單卷")
 
-        nodes = tree.xpath('//div[@id="chapterList"]/details') + tree.xpath(
-            '//div[@id="chapterList"]/*[not(self::details)]'
-        )
+        # nodes = tree.xpath('//div[@id="chapterList"]/details') + tree.xpath(
+        #     '//div[@id="chapterList"]/*[not(self::details)]'
+        # )
+        nodes = tree.xpath('//div[@id="chapterList"]/*')
 
         for node in nodes:
             tag = node.tag.lower()

novel_downloader/core/savers/base.py

@@ -40,9 +40,9 @@ class BaseSaver(SaverProtocol, abc.ABC):
         self._config = config
 
         self._base_cache_dir = Path(config.cache_dir)
-        self._raw_data_dir = Path(config.raw_data_dir)
+        self._base_raw_data_dir = Path(config.raw_data_dir)
         self._output_dir = Path(config.output_dir)
-        self._raw_data_dir.mkdir(parents=True, exist_ok=True)
+        self._base_cache_dir.mkdir(parents=True, exist_ok=True)
         self._output_dir.mkdir(parents=True, exist_ok=True)
 
         self._filename_template = config.filename_template
@@ -158,11 +158,6 @@ class BaseSaver(SaverProtocol, abc.ABC):
         """Access the output directory for saving files."""
         return self._output_dir
 
-    @property
-    def raw_data_dir(self) -> Path:
-        """Access the raw data directory."""
-        return self._raw_data_dir
-
     @property
     def filename_template(self) -> str:
         """Access the filename template."""

novel_downloader/core/savers/common/epub.py

@@ -11,53 +11,30 @@ from __future__ import annotations
 import json
 from pathlib import Path
 from typing import TYPE_CHECKING
-from urllib.parse import unquote, urlparse
 
 from ebooklib import epub
 
 from novel_downloader.core.savers.epub_utils import (
+    add_images_from_dir,
     chapter_txt_to_html,
     create_css_items,
     create_volume_intro,
     generate_book_intro_html,
     init_epub,
+    inline_remote_images,
 )
 from novel_downloader.utils.constants import (
-    DEFAULT_IMAGE_SUFFIX,
     EPUB_OPTIONS,
     EPUB_TEXT_FOLDER,
 )
 from novel_downloader.utils.file_utils import sanitize_filename
+from novel_downloader.utils.network import download_image
 from novel_downloader.utils.text_utils import clean_chapter_title
 
 if TYPE_CHECKING:
     from .main_saver import CommonSaver
 
 
-def _image_url_to_filename(url: str) -> str:
-    """
-    Parse and sanitize a image filename from a URL.
-    If no filename or suffix exists, fallback to default name and extension.
-
-    :param url: URL string
-    :return: Safe filename string
-    """
-    if not url:
-        return ""
-
-    parsed_url = urlparse(url)
-    path = unquote(parsed_url.path)
-    filename = Path(path).name
-
-    if not filename:
-        filename = "image"
-
-    if not Path(filename).suffix:
-        filename += DEFAULT_IMAGE_SUFFIX
-
-    return filename
-
-
 def common_save_as_epub(
     saver: CommonSaver,
     book_id: str,
@@ -76,11 +53,12 @@ def common_save_as_epub(
     :param book_id: Identifier of the novel (used as subdirectory name).
     """
     TAG = "[saver]"
-    site = saver.site
     config = saver._config
     # --- Paths & options ---
-    raw_base = saver.raw_data_dir / site / book_id
+    raw_base = saver._raw_data_dir / book_id
+    img_dir = saver._cache_dir / book_id / "images"
     out_dir = saver.output_dir
+    img_dir.mkdir(parents=True, exist_ok=True)
     out_dir.mkdir(parents=True, exist_ok=True)
 
     # --- Load book_info.json ---
@@ -100,10 +78,16 @@ def common_save_as_epub(
     # --- Generate intro + cover ---
     intro_html = generate_book_intro_html(book_info)
     cover_path: Path | None = None
-    if config.include_cover:
-        cover_filename = _image_url_to_filename(book_info.get("cover_url", ""))
-        if cover_filename:
-            cover_path = raw_base / cover_filename
+    cover_url = book_info.get("cover_url", "")
+    if config.include_cover and cover_url:
+        cover_path = download_image(
+            cover_url,
+            raw_base,
+            target_name="cover",
+            on_exist="overwrite",
+        )
+        if not cover_path:
+            saver.logger.warning("Failed to download cover from %s", cover_url)
 
     # --- Initialize EPUB ---
     book, spine, toc_list = init_epub(
@@ -162,9 +146,11 @@ def common_save_as_epub(
                 continue
 
             title = clean_chapter_title(chapter_data.get("title", "")) or chap_id
+            content: str = chapter_data.get("content", "")
+            content = inline_remote_images(content, img_dir)
             chap_html = chapter_txt_to_html(
                 chapter_title=title,
-                chapter_text=chapter_data.get("content", ""),
+                chapter_text=content,
                 author_say=chapter_data.get("author_say", ""),
             )
 
@@ -182,6 +168,8 @@ def common_save_as_epub(
 
         toc_list.append((section, chapter_items))
 
+    book = add_images_from_dir(book, img_dir)
+
     # --- 5. Finalize EPUB ---
     saver.logger.info("%s Building TOC and spine...", TAG)
     book.toc = toc_list

novel_downloader/core/savers/common/main_saver.py

@@ -41,6 +41,8 @@ class CommonSaver(BaseSaver):
         """
         super().__init__(config)
         self._site = site
+        self._raw_data_dir = self._base_raw_data_dir / site
+        self._cache_dir = self._base_cache_dir / site
         self._chapter_storage_cache: dict[str, list[ChapterStorage]] = {}
         self._chap_folders: list[str] = chap_folders or ["chapters"]
 
@@ -109,7 +111,7 @@ class CommonSaver(BaseSaver):
         return {}
 
     def _init_chapter_storages(self, book_id: str) -> None:
-        raw_base = self.raw_data_dir / self._site / book_id
+        raw_base = self._raw_data_dir / book_id
         self._chapter_storage_cache[book_id] = [
             ChapterStorage(
                 raw_base=raw_base,

novel_downloader/core/savers/common/txt.py

@@ -45,9 +45,8 @@ def common_save_as_txt(
     :param book_id: Identifier of the novel (used as subdirectory name).
     """
     TAG = "[saver]"
-    site = saver.site
     # --- Paths & options ---
-    raw_base = saver.raw_data_dir / site / book_id
+    raw_base = saver._raw_data_dir / book_id
     out_dir = saver.output_dir
     out_dir.mkdir(parents=True, exist_ok=True)
 

novel_downloader/core/savers/epub_utils/__init__.py

@@ -6,21 +6,30 @@ novel_downloader.core.savers.epub_utils
 This package provides utility functions for constructing EPUB files,
 including:
 
-- CSS inclusion (create_css_items)
-- EPUB book initialization (init_epub)
-- Chapter text-to-HTML conversion (chapter_txt_to_html)
-- Volume intro HTML generation (create_volume_intro)
+- 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
 from .initializer import init_epub
-from .text_to_html import chapter_txt_to_html, generate_book_intro_html
+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",
     "init_epub",
     "chapter_txt_to_html",
     "create_volume_intro",
     "generate_book_intro_html",
+    "inline_remote_images",
 ]

novel_downloader/core/savers/epub_utils/css_builder.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """
 novel_downloader.core.savers.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.

novel_downloader/core/savers/epub_utils/image_loader.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.savers.epub_utils.image_loader
+----------------------------------------------------
+
+Utilities for embedding image files into an EpubBook.
+"""
+
+import logging
+from collections.abc import Iterable
+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_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.info("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

novel_downloader/core/savers/epub_utils/initializer.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """
 novel_downloader.core.savers.epub_utils.initializer
+---------------------------------------------------
 
 Initializes an epub.EpubBook object, sets metadata
 (identifier, title, author, language, description),

novel_downloader/core/savers/epub_utils/text_to_html.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """
 novel_downloader.core.savers.epub_utils.text_to_html
+----------------------------------------------------
 
 Module for converting raw chapter text to formatted HTML,
 with automatic word correction and optional image/tag support.
@@ -8,13 +9,23 @@ with automatic word correction and optional image/tag support.
 
 import json
 import logging
+import re
+from pathlib import Path
 from typing import Any
 
-from novel_downloader.utils.constants import REPLACE_WORD_MAP_PATH
+from novel_downloader.utils.constants import (
+    EPUB_IMAGE_WRAPPER,
+    REPLACE_WORD_MAP_PATH,
+)
+from novel_downloader.utils.network import download_image
 from novel_downloader.utils.text_utils import diff_inline_display
 
 logger = logging.getLogger(__name__)
 
+_IMG_TAG_PATTERN = re.compile(
+    r'<img\s+[^>]*src=[\'"]([^\'"]+)[\'"][^>]*>', re.IGNORECASE
+)
+
 
 # Load and sort replacement map from JSON
 try:
@@ -87,6 +98,42 @@ def chapter_txt_to_html(
     return "\n".join(html_parts)
 
 
+def inline_remote_images(
+    content: str,
+    image_dir: str | Path,
+) -> str:
+    """
+    Download every remote <img src="…"> in `content` into `image_dir`,
+    and replace the original tag with EPUB_IMAGE_WRAPPER
+    pointing to the local filename.
+
+    :param content: HTML/text of the chapter containing <img> tags.
+    :param image_dir: Directory to save downloaded images into.
+    :return: Modified content with local image references.
+    """
+
+    def _replace(match: re.Match[str]) -> str:
+        url = match.group(1)
+        try:
+            # download_image returns a Path or None
+            local_path = download_image(
+                url, image_dir, target_name=None, on_exist="skip"
+            )
+            if not local_path:
+                logger.warning(
+                    "Failed to download image, leaving original tag: %s", url
+                )
+                return match.group(0)
+
+            # wrap with the EPUB_IMAGE_WRAPPER, inserting just the filename
+            return EPUB_IMAGE_WRAPPER.format(filename=local_path.name)
+        except Exception:
+            logger.exception("Error processing image URL: %s", url)
+            return match.group(0)
+
+    return _IMG_TAG_PATTERN.sub(_replace, content)
+
+
 def generate_book_intro_html(book_info: dict[str, Any]) -> str:
     """
     Generate HTML string for a book's information and summary.

novel_downloader/core/savers/epub_utils/volume_intro.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 """
 novel_downloader.core.savers.epub_utils.volume_intro
+----------------------------------------------------
 
 Responsible for generating HTML code for volume introduction pages,
 including two style variants and a unified entry point.

novel_downloader/utils/constants.py

@@ -116,6 +116,10 @@ BLACKLIST_PATH = files("novel_downloader.resources.text").joinpath("blacklist.tx
 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,

novel_downloader/utils/file_utils/io.py

@@ -103,7 +103,7 @@ def _write_file(
             tmp.write(content_to_write)
             tmp_path = Path(tmp.name)
         tmp_path.replace(path)
-        logger.info("[file] '%s' written successfully", path)
+        logger.debug("[file] '%s' written successfully", path)
         return True
     except Exception as exc:
         logger.warning("[file] Error writing %r: %s", path, exc)

novel_downloader/utils/network.py

@@ -16,7 +16,7 @@ from urllib.parse import unquote, urlparse
 import requests
 
 from .constants import DEFAULT_HEADERS, DEFAULT_IMAGE_SUFFIX
-from .file_utils.io import _get_non_conflicting_path, _write_file, read_binary_file
+from .file_utils.io import _get_non_conflicting_path, _write_file
 
 logger = logging.getLogger(__name__)
 
@@ -84,28 +84,28 @@ def image_url_to_filename(url: str) -> str:
     return filename
 
 
-def download_image_as_bytes(
+def download_image(
     url: str,
     target_folder: str | Path | None = None,
+    target_name: str | None = None,
     *,
     timeout: int = 10,
     retries: int = 3,
     backoff: float = 0.5,
     on_exist: Literal["overwrite", "skip", "rename"] = "overwrite",
-) -> bytes | None:
+) -> Path | None:
     """
-    Download an image from a given URL and return its content as bytes.
-
-    If on_exist='skip' and the file already exists, it will be read from disk
-    instead of being downloaded again.
+    Download an image from `url` and save it to `target_folder`, returning the Path.
+    Can override the filename via `target_name`.
 
     :param url: Image URL. Can start with 'http', '//', or without protocol.
-    :param target_folder: Optional folder to save the image (str or Path).
+    :param target_folder: Directory to save into (defaults to cwd).
+    :param target_name: Optional filename (with or without extension).
     :param timeout: Request timeout in seconds.
     :param retries: Number of retry attempts.
     :param backoff: Base delay between retries (exponential backoff).
     :param on_exist: What to do if file exists: 'overwrite', 'skip', or 'rename'.
-    :return: Image content as bytes, or None if failed.
+    :return: Path to the saved image, or `None` on any failure.
     """
     # Normalize URL
     if url.startswith("//"):
@@ -113,21 +113,28 @@ def download_image_as_bytes(
     elif not url.startswith("http"):
         url = "https://" + url
 
-    save_path = None
-    if target_folder:
-        target_folder = Path(target_folder)
-        filename = image_url_to_filename(url)
-        save_path = target_folder / filename
-
-        if on_exist == "skip" and save_path.exists():
-            logger.info(
-                "[image] '%s' exists, skipping download and reading from disk.",
-                save_path,
-            )
-            return read_binary_file(save_path)
+    folder = Path(target_folder) if target_folder else Path.cwd()
+    folder.mkdir(parents=True, exist_ok=True)
+
+    if target_name:
+        name = target_name
+        if not Path(name).suffix:
+            # infer ext from URL-derived name
+            name += Path(image_url_to_filename(url)).suffix
+    else:
+        name = image_url_to_filename(url)
+    save_path = folder / name
+
+    # Handle existing file
+    if save_path.exists():
+        if on_exist == "skip":
+            logger.debug("Skipping download; file exists: %s", save_path)
+            return save_path
+        if on_exist == "rename":
+            save_path = _get_non_conflicting_path(save_path)
 
     # Proceed with download
-    response = http_get_with_retry(
+    resp = http_get_with_retry(
         url,
         retries=retries,
         timeout=timeout,
@@ -136,19 +143,25 @@ def download_image_as_bytes(
         stream=False,
     )
 
-    if response and response.ok:
-        content = response.content
-
-        if save_path:
-            _write_file(
-                content=content,
-                filepath=save_path,
-                mode="wb",
-                on_exist=on_exist,
-            )
-
-        return content
+    if not (resp and resp.ok):
+        logger.warning(
+            "Failed to download %s (status=%s)",
+            url,
+            getattr(resp, "status_code", None),
+        )
+        return None
 
+    # Write to disk
+    try:
+        _write_file(
+            content=resp.content,
+            filepath=save_path,
+            mode="wb",
+            on_exist=on_exist,
+        )
+        return save_path
+    except Exception:
+        logger.exception("Error saving image to %s", save_path)
     return None
 
 
@@ -191,7 +204,7 @@ def download_font_file(
 
     # If skip and file exists -> return immediately
     if on_exist == "skip" and font_path.exists():
-        logger.info("[font] File exists, skipping download: %s", font_path)
+        logger.debug("[font] File exists, skipping download: %s", font_path)
         return font_path
 
     # Retry download with exponential backoff
@@ -214,7 +227,7 @@ def download_font_file(
                     if chunk:
                         f.write(chunk)
 
-            logger.info("[font] Font saved to: %s", font_path)
+            logger.debug("[font] Font saved to: %s", font_path)
             return font_path
 
         except Exception as e:
@@ -258,7 +271,7 @@ def download_js_file(
     save_path = target_folder / filename
 
     if on_exist == "skip" and save_path.exists():
-        logger.info("[js] File exists, skipping download: %s", save_path)
+        logger.debug("[js] File exists, skipping download: %s", save_path)
         return save_path
 
     response = http_get_with_retry(
@@ -278,7 +291,7 @@ def download_js_file(
 
         try:
             _write_file(content=content, filepath=save_path, mode="wb")
-            logger.info("[js] JS file saved to: %s", save_path)
+            logger.debug("[js] JS file saved to: %s", save_path)
             return save_path
         except Exception as e:
             logger.error("[js] Error writing JS to disk: %s", e)

novel_downloader/utils/time_utils/sleep_utils.py

@@ -56,7 +56,7 @@ def sleep_with_random_delay(
     if max_sleep is not None:
         duration = min(duration, max_sleep)
 
-    logger.info("[time] Sleeping for %.2f seconds", duration)
+    logger.debug("[time] Sleeping for %.2f seconds", duration)
     time.sleep(duration)
     return
 
@@ -98,7 +98,7 @@ async def async_sleep_with_random_delay(
     if max_sleep is not None:
         duration = min(duration, max_sleep)
 
-    logger.info("[async time] Sleeping for %.2f seconds", duration)
+    logger.debug("[async time] Sleeping for %.2f seconds", duration)
     await asyncio.sleep(duration)
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.3.2
+Version: 1.3.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
@@ -69,33 +69,33 @@ Dynamic: license-file
 
 # novel-downloader
 
-一个基于 [DrissionPage](https://www.drissionpage.cn) 和 [requests](https://github.com/psf/requests) 的小说下载器。
+一个基于 [DrissionPage](https://www.drissionpage.cn) 和 [requests](https://github.com/psf/requests) 的小说下载工具/库。
 
 ---
 
 ## 项目简介
 
-**novel-downloader** 是一个通用的小说下载库 / CLI 工具,
-- 大多数支持的站点仅依赖 [`requests`](https://github.com/psf/requests) 进行 HTTP 抓取
+**novel-downloader** 支持多种小说网站的章节抓取与合并导出,
+- **轻量化抓取**: 绝大多数站点仅依赖 `requests` 实现 HTTP 请求, 无需额外浏览器驱动
 - 对于起点中文网 (Qidian), 可在配置中选择:
   - `mode: session` : 纯 Requests 模式
-  - `mode: browser`  : 基于 DrissionPage 驱动 Chrome 的浏览器模式 (可处理更复杂的 JS/加密)。
-- 若配置 `login_required: true`, 程序会在运行时自动检查登录状态, 支持自动重用历史 Cookie, 仅在首次登录或 Cookie 失效时需要人工介入:
-  - 若使用 `browser` 模式, 请在程序打开的浏览器窗口登录, 登录后回车继续
-  - 若使用 `session` 模式, 请根据程序提示粘贴浏览器中登录成功后的 Cookie ([复制 Cookies](https://github.com/BowenZ217/novel-downloader/blob/main/docs/copy-cookies.md))
+  - `mode: browser`  : 基于 `DrissionPage` 驱动 Chrome 的浏览器模式 (可处理更复杂的 JS/加密)。
+- **自动登录** (可选)
+  - 配置 `login_required: true` 后自动检测并重用历史 Cookie
+  - 首次登录或 Cookie 失效时:
+    - **browser** 模式: 在程序打开的浏览器窗口登录, 登录后回车继续
+    - **session** 模式: 根据提示粘贴浏览器中已登录的 Cookie (参考 [复制 Cookies](https://github.com/BowenZ217/novel-downloader/blob/main/docs/copy-cookies.md))
 
 ## 功能特性
 
-- 爬取起点中文网的小说章节内容 (支持免费与已订阅章节)
-- 爬取部分小说网站
-- 断点续爬
-- 自动整合所有章节并导出为
+- 抓取起点中文网免费及已订阅章节内容
+- 支持断点续爬, 自动续传未完成任务
+- 自动整合所有章节并导出为:
   - TXT
-  - EPUB
+  - EPUB (可选包含章节插图)
 - 支持活动广告过滤:
   - [x] 章节标题
   - [ ] 章节正文
-  - [ ] 作者说
 
 ---
 

{novel_downloader-1.3.2.dist-info → novel_downloader-1.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-novel_downloader/__init__.py,sha256=tgzKUoWTjv0K2gxgUrJQ1651mAwAMSJ53YBUWRd0oIc,218
+novel_downloader/__init__.py,sha256=PZq_WVjwD4TOnmRr2jf4YwV4Hpt3y6WSvHDpEl4jsE0,218
 novel_downloader/cli/__init__.py,sha256=-2HAut_U1e67MZGdvbpEJ1n5J-bRchzto6L4c-nWeXY,174
 novel_downloader/cli/clean.py,sha256=yjPDEoJRZnP_Xq-y0vA2ZhyNP-GxCM1UosW4gVR3VBI,3687
 novel_downloader/cli/download.py,sha256=r-l-HHFdRb6pWkJVcDl_MoC8pf57l2ixoVFnDLtEWcc,4001
@@ -19,8 +19,8 @@ novel_downloader/core/downloaders/biquge/__init__.py,sha256=qlbLU0WWx9AY_hYW_brd
 novel_downloader/core/downloaders/biquge/biquge_async.py,sha256=8cEUmhCz1YTCYWpZezZIX7DlbqFDXvZF-T9ylXT56mE,705
 novel_downloader/core/downloaders/biquge/biquge_sync.py,sha256=bxgZRw4sUMhbMBCivoKxHLIpixEHxpwXOjUdr7g-Qks,686
 novel_downloader/core/downloaders/common/__init__.py,sha256=KZwtl9K7ZhN8Nnnk9BBOVWZ-QJ5GQBsRAoG7x2OlVYM,273
-novel_downloader/core/downloaders/common/common_async.py,sha256=wXRCdw17ieeuSwqw34yY3lXIecIydlKs5qeofubV0yE,7535
-novel_downloader/core/downloaders/common/common_sync.py,sha256=X37mJukScti-Ic3s1AOVdYP-EPNRtL-MKGkw2RnhH1M,7162
+novel_downloader/core/downloaders/common/common_async.py,sha256=n2rBLzHwF7QawRI5PPticzcM0QTLH_SAzx21uQoFODk,7226
+novel_downloader/core/downloaders/common/common_sync.py,sha256=sekb0g-FRP3JX51I4hAeUnUe6mKRfOa_6LrA3uJ1Blo,6811
 novel_downloader/core/downloaders/esjzone/__init__.py,sha256=6RV3aodbuR0znTAGHn8G6GPGTO6TbJa4ykrFWyPI4iA,281
 novel_downloader/core/downloaders/esjzone/esjzone_async.py,sha256=g52LD5iO1c0jGlNPP795a82VoQY1wggh12GATBNklQg,711
 novel_downloader/core/downloaders/esjzone/esjzone_sync.py,sha256=Spp9Nnu1CqKCQlxp0XSCf_cbGTOEkLQuD2u5GIE0QoY,692
@@ -28,7 +28,7 @@ novel_downloader/core/downloaders/qianbi/__init__.py,sha256=zj8DyyEnK7xRXVsZF3SW
 novel_downloader/core/downloaders/qianbi/qianbi_async.py,sha256=-bJaRC-QCgZoQTmUg02bcjEpL_f0L7fHtLrMnkiZ-sU,705
 novel_downloader/core/downloaders/qianbi/qianbi_sync.py,sha256=mLDXNLKKqKlyY_SOWAVOtD88sQ4UrDecnZzaWxCvfqg,686
 novel_downloader/core/downloaders/qidian/__init__.py,sha256=LCdrqLI2iTCGERmlAwKtr-PKtvDh_rs2vKD891-ixvo,189
-novel_downloader/core/downloaders/qidian/qidian_sync.py,sha256=1dvw7b82Hgo4bEPgLNb5gNJhtsWgGkcNEe3iR9jKa4U,8201
+novel_downloader/core/downloaders/qidian/qidian_sync.py,sha256=7W0WKB7hh-k5iaz0zsoFgimU1VCEv2_nA1oqvgnli6Q,7845
 novel_downloader/core/downloaders/sfacg/__init__.py,sha256=GB9jof4Mlr9av-NWSh-3-fWf-KqZm9jBJXVFS4z-Uxs,265
 novel_downloader/core/downloaders/sfacg/sfacg_async.py,sha256=4XWW7rSCYO7o4wzhHSz_Oq14zPj3BW-WZn-rasNLpIA,699
 novel_downloader/core/downloaders/sfacg/sfacg_sync.py,sha256=G0cfA-CLWMtQ_C71ISjNbI9I8EBmvpZyeE5X9b7OXJQ,680
@@ -55,7 +55,7 @@ novel_downloader/core/parsers/common/__init__.py,sha256=MzNUUxvf7jmeO0LvQ_FRW0QL
 novel_downloader/core/parsers/common/helper.py,sha256=SSNES1AlGu5LqPXN61Rp6SmVgR4oKaI2gvLJfEYBsF4,12054
 novel_downloader/core/parsers/common/main_parser.py,sha256=c3n6byn_zRg9ROH3DpNl0J-2Dgw7y9OekXeQVDxnO0c,3170
 novel_downloader/core/parsers/esjzone/__init__.py,sha256=RSsUdOvaiqv-rTaYVc-qO25jytRCj9X2EYErMltA_b8,177
-novel_downloader/core/parsers/esjzone/main_parser.py,sha256=GO4DH6LjEG9ptnT5quj1fz3djZOgbzgaTdM41IRueYI,8231
+novel_downloader/core/parsers/esjzone/main_parser.py,sha256=Uw6lhLf9-uEGVtoudLN0-1C3mwTLUiH2D7zoHGRH4Rs,8294
 novel_downloader/core/parsers/qianbi/__init__.py,sha256=CNmoER8U2u4-ix5S0DDq-pHTtkLR0IZf2SLaTTYXee4,173
 novel_downloader/core/parsers/qianbi/main_parser.py,sha256=AebvhngCq62S8LZX4vKu40U--V4cvvggHxGKFO5dkVI,4776
 novel_downloader/core/parsers/qidian/__init__.py,sha256=-KvMBzggUaj5zeZKFpVbbx5GRJdykwaFPfxJc4KzF-Q,484
@@ -104,7 +104,7 @@ novel_downloader/core/requesters/yamibo/__init__.py,sha256=_bhw5RZ7-X8P9X5U3rteM
 novel_downloader/core/requesters/yamibo/async_session.py,sha256=ezANq7EQaFNUYgvy59g26mqC0TbaaYLziLFQmbcl8pU,6881
 novel_downloader/core/requesters/yamibo/session.py,sha256=_QUboNnJOipDLm9o7E6ZKt-D68I3r40B6VX8fQmNeOQ,7437
 novel_downloader/core/savers/__init__.py,sha256=QFsxESFvTx6yaW3dgLwBBkrpydroVOlfgOnhGnVjsmo,720
-novel_downloader/core/savers/base.py,sha256=Kx-gPZwnqMGCV2u_tO6-cH0zx640RfF9rF_qeipQxOw,5568
+novel_downloader/core/savers/base.py,sha256=UUTirwqU16IoUamWwvs2VOtwN2elkXBXsyacVtcSDrw,5445
 novel_downloader/core/savers/biquge.py,sha256=8kZ6hcXuXmaizaKKytjy3LIGX5kMJRwgUJdhYzH5ajE,445
 novel_downloader/core/savers/esjzone.py,sha256=WNIgIEOfW0_fstTCgtcTAZF3YZmDqSVxIQI5-veTPZ4,450
 novel_downloader/core/savers/qianbi.py,sha256=wVxR3WJf1dqLCgbaAnXU1q1LOAnjYHNE9bQX5Oql4us,445
@@ -112,14 +112,15 @@ novel_downloader/core/savers/qidian.py,sha256=HtIz2SHLL-BZbVuahu6voKpgWtlli14_YY
 novel_downloader/core/savers/sfacg.py,sha256=LeiVyIIeoBdHmR3BZlXn4OaQzn9psqXC0FQkBb6VF-c,440
 novel_downloader/core/savers/yamibo.py,sha256=aMfp1cu6PGEUcexvYR8QwB3PzJDa4p4dQTT1rZ6RzIk,445
 novel_downloader/core/savers/common/__init__.py,sha256=V5EbaRwmdXlQKi4Ce9SLstl0c9x9yTTRUB23rXFCvXw,256
-novel_downloader/core/savers/common/epub.py,sha256=ZmTt3kAODa8lQKpgegbJY_7qcKQmoVQ8h5JPZYBSJbI,6370
-novel_downloader/core/savers/common/main_saver.py,sha256=O-XFfDAlOun0kSBBHEIktwUcm47CsXgmFOkyK3fP_1M,3826
-novel_downloader/core/savers/common/txt.py,sha256=nsYQp3-xti5uAj3r736ZKDg0gzrme2YoQ8bUTOG2jHk,4853
-novel_downloader/core/savers/epub_utils/__init__.py,sha256=ZzOOsuHL9O0CsE9xl0vAcvxxlBz4AkDVOlTnsfNGN7Q,714
-novel_downloader/core/savers/epub_utils/css_builder.py,sha256=sa8t72YNKkGeqC6dflXz1iefcpUqZ6t80VVZE91XfNw,2087
-novel_downloader/core/savers/epub_utils/initializer.py,sha256=6qId5UTSjXnqSs9S9XrWGELAgq4fNut71CYIq7b6LQE,3199
-novel_downloader/core/savers/epub_utils/text_to_html.py,sha256=omqob2yKFYru2dvHTQuGVQH9RH_VQXxMSopzwd_-6_I,4087
-novel_downloader/core/savers/epub_utils/volume_intro.py,sha256=aJAdEU2YvYkX2sqnU5VkZ33XRfb5x083GdDmDXcQpUI,1771
+novel_downloader/core/savers/common/epub.py,sha256=_m1_M5Q6wlwRZsTvSzEeucUQXUllC8mg0KLvlByTVug,6260
+novel_downloader/core/savers/common/main_saver.py,sha256=8t8Ql22P-ufB4k2bgxFfNHwHWpNW7T1FzfLeWkkWigU,3928
+novel_downloader/core/savers/common/txt.py,sha256=wn3L12Rxioe3kZzzDcDWKxMKdkgkkY4BVlhhTXNe-as,4825
+novel_downloader/core/savers/epub_utils/__init__.py,sha256=E0FDYMy1JsWoaywY9YYhPhhoa2Ei_Nf1Syu3hRiZ5uc,920
+novel_downloader/core/savers/epub_utils/css_builder.py,sha256=YtLqyvzz3PaQCvdQPaxnxp3kJiT21FUufsJEOeP2Duo,2139
+novel_downloader/core/savers/epub_utils/image_loader.py,sha256=Dg72e5Eje3orclJIBgLaqKKJgZdLB0F2zDB_0QIJTy8,2608
+novel_downloader/core/savers/epub_utils/initializer.py,sha256=kFE7QhVqokh5_gsRqnMZ48gVTIftrZwH9UEs1mRKvvY,3251
+novel_downloader/core/savers/epub_utils/text_to_html.py,sha256=pVQv4r5N6KAfQflnSUz7dapt9DzXZOXPJ3XFZXeNUiE,5609
+novel_downloader/core/savers/epub_utils/volume_intro.py,sha256=y91JCIuvUGn6V7cF5UpTmBgL8IwhoUGBvQs8enaooZs,1824
 novel_downloader/locales/en.json,sha256=jxo_hdwRPnWFHLWNkqz5QPMVD7l_JHHwBrYDinWPSTg,5991
 novel_downloader/locales/zh.json,sha256=64Dujc70etkWq7bR4DuQOtZ-VdoynH8HJl8E8hxV1B4,5864
 novel_downloader/resources/config/rules.toml,sha256=hrED6h3Z3cjSY5hRPQhp4TFAU5QXnN9xHfVABOJQNrM,4979
@@ -133,17 +134,17 @@ novel_downloader/resources/text/blacklist.txt,sha256=sovK9JgARZP3lud5b1EZgvv8LSV
 novel_downloader/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 novel_downloader/utils/cache.py,sha256=_jVEWAaMGY86kWVnAuuIvJA_hA8dH2ClI7o3p99mEvE,618
 novel_downloader/utils/chapter_storage.py,sha256=bbQ6mLvIzhWNUypIcgg6-nPo1_fIgGCOyQ3eejuvcK4,10100
-novel_downloader/utils/constants.py,sha256=7qr6_w7bM-Xf-Pz6ZFgamsR9JNl7RgFNmHvSWN2fcgg,5507
+novel_downloader/utils/constants.py,sha256=nUZFjbkvUV-kHryzAKhNiKpPud67tlzyH47uqQRbSV0,5619
 novel_downloader/utils/crypto_utils.py,sha256=9uMNpg0rAWaoD3YsqDucFajPjoQuwEfeZDInUBISuSI,4166
 novel_downloader/utils/hash_store.py,sha256=pFg2SzPF9sZqezNx-24jSDvYw4YMSBOpiIjyUbZx_r8,9739
 novel_downloader/utils/hash_utils.py,sha256=oaXICmANsqImXW1qNSVmVQbMfNbx35FHe7EHL2VT2tM,2974
 novel_downloader/utils/i18n.py,sha256=pdAcSIA5Tp-uPEBwNByHL7C1NayTnpOsl7zFv9p2G1k,1033
 novel_downloader/utils/logger.py,sha256=n5xggOejtNdZv2X9f4Cq8weOaT1KG0n0-im2LIYycu0,3377
 novel_downloader/utils/model_loader.py,sha256=JKgRFrr4HlAW9zuDUBAuuo_Kk_T_g9dWiU8E3zYk0vo,1996
-novel_downloader/utils/network.py,sha256=2VX33jo11tzHSqvinpd0VoXDkXK_uxdxqaq50ndWXXg,8622
+novel_downloader/utils/network.py,sha256=163lRigwVEgZ9nozxHZVjxMKt-9s5j8s3mBJAnOwR4c,9089
 novel_downloader/utils/state.py,sha256=FcNJ85GvBu7uEIjy0QHGr4sXMbHPEMkCjwUKNg5EabI,5132
 novel_downloader/utils/file_utils/__init__.py,sha256=zvOm2qSEmWd_mRGJceGBZb5MYMSDAlWYjS5MkVQNZgI,1159
-novel_downloader/utils/file_utils/io.py,sha256=73uRrr41_Obqy9HMFBnvcOcApMZYBNi4KWT4DpskSk8,7472
+novel_downloader/utils/file_utils/io.py,sha256=AZ3NUe6lifGsYt3iYyXyQ2BO41WV8j013LpZy4KSjJQ,7473
 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
@@ -156,10 +157,10 @@ novel_downloader/utils/text_utils/font_mapping.py,sha256=ePpNLSrIEwIpqpnPZBMODj-
 novel_downloader/utils/text_utils/text_cleaning.py,sha256=KQhTGKiSX-eBVmjSpggxtf1hSjQLTu3cIjt65Ir4SWs,1632
 novel_downloader/utils/time_utils/__init__.py,sha256=725vY2PvqFhjbAz0hCOuIuhSCK8HrEqQ_k3YwvubmXo,624
 novel_downloader/utils/time_utils/datetime_utils.py,sha256=u8jiC1NHzn2jKpuatMlbBhTEZnZ-8nAC_yY7-hJ-Yws,4936
-novel_downloader/utils/time_utils/sleep_utils.py,sha256=PkG1OUs6V8tDGg3xWgh1yRpot8tPC6W5xYTjaqKY37I,3229
-novel_downloader-1.3.2.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
-novel_downloader-1.3.2.dist-info/METADATA,sha256=Wiycc-7wEaLskTP70uY5UWMJT-8jSm72KMsbdszeeWU,6739
-novel_downloader-1.3.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-novel_downloader-1.3.2.dist-info/entry_points.txt,sha256=v23QrJrfrAcYpxUYslCVxubOVRRTaTw7vlG_tfMsFP8,65
-novel_downloader-1.3.2.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
-novel_downloader-1.3.2.dist-info/RECORD,,
+novel_downloader/utils/time_utils/sleep_utils.py,sha256=JQ-GH_jvjojcNAcq5N8TnRvsCwOmd_4bltPtYBSqgRw,3231
+novel_downloader-1.3.3.dist-info/licenses/LICENSE,sha256=XgmnH0mBf-qEiizoVAfJQAKzPB9y3rBa-ni7M0Aqv4A,1066
+novel_downloader-1.3.3.dist-info/METADATA,sha256=i9zmpPImOvOAzQpuduWZQ5MAk3OpZsno688d2CuUQFM,6700
+novel_downloader-1.3.3.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+novel_downloader-1.3.3.dist-info/entry_points.txt,sha256=v23QrJrfrAcYpxUYslCVxubOVRRTaTw7vlG_tfMsFP8,65
+novel_downloader-1.3.3.dist-info/top_level.txt,sha256=hP4jYWM2LTm1jxsW4hqEB8N0dsRvldO2QdhggJT917I,17
+novel_downloader-1.3.3.dist-info/RECORD,,