novel-downloader 1.4.4__tar.gz → 1.5.0__tar.gz

{novel_downloader-1.4.4/src/novel_downloader.egg-info → novel_downloader-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: novel-downloader
-Version: 1.4.4
+Version: 1.5.0
 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
@@ -83,7 +83,7 @@ Dynamic: license-file
   - EPUB (可选包含章节插图)
 - 支持活动广告过滤:
   - [x] 章节标题
-  - [ ] 章节正文
+  - [x] 章节正文
 
 ---
 

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/README.md

@@ -12,7 +12,7 @@
   - EPUB (可选包含章节插图)
 - 支持活动广告过滤:
   - [x] 章节标题
-  - [ ] 章节正文
+  - [x] 章节正文
 
 ---
 

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/pyproject.toml

@@ -116,7 +116,7 @@ testpaths = ["tests"]
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.4.4"
+version = "1.5.0"
 version_files = [
     "src/novel_downloader/__init__.py"
 ]

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/src/novel_downloader/__init__.py

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

novel_downloader-1.5.0/src/novel_downloader/cli/config.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.cli.config
+---------------------------
+
+CLI subcommands for configuration management.
+"""
+
+import shutil
+from argparse import Namespace, _SubParsersAction
+from importlib.resources import as_file
+from pathlib import Path
+
+from novel_downloader.config import save_config_file
+from novel_downloader.utils.constants import DEFAULT_SETTINGS_PATHS
+from novel_downloader.utils.i18n import t
+from novel_downloader.utils.state import state_mgr
+
+
+def register_config_subcommand(subparsers: _SubParsersAction) -> None:  # type: ignore
+    parser = subparsers.add_parser("config", help=t("help_config"))
+    config_subparsers = parser.add_subparsers(dest="subcommand", required=True)
+
+    _register_init(config_subparsers)
+    _register_set_lang(config_subparsers)
+    _register_set_config(config_subparsers)
+
+
+def _register_init(subparsers: _SubParsersAction) -> None:  # type: ignore
+    parser = subparsers.add_parser("init", help=t("settings_init_help"))
+    parser.add_argument(
+        "--force", action="store_true", help=t("settings_init_force_help")
+    )
+    parser.set_defaults(func=_handle_init)
+
+
+def _register_set_lang(subparsers: _SubParsersAction) -> None:  # type: ignore
+    parser = subparsers.add_parser("set-lang", help=t("settings_set_lang_help"))
+    parser.add_argument("lang", choices=["zh", "en"], help="Language code")
+    parser.set_defaults(func=_handle_set_lang)
+
+
+def _register_set_config(subparsers: _SubParsersAction) -> None:  # type: ignore
+    parser = subparsers.add_parser("set-config", help=t("settings_set_config_help"))
+    parser.add_argument("path", type=str, help="Path to YAML config file")
+    parser.set_defaults(func=_handle_set_config)
+
+
+def _handle_init(args: Namespace) -> None:
+    cwd = Path.cwd()
+
+    for resource in DEFAULT_SETTINGS_PATHS:
+        target_path = cwd / resource.name
+        should_copy = True
+
+        if target_path.exists():
+            if args.force:
+                print(t("settings_init_overwrite", filename=resource.name))
+            else:
+                print(t("settings_init_exists", filename=resource.name))
+                resp = (
+                    input(
+                        t("settings_init_confirm_overwrite", filename=resource.name)
+                        + " [y/N]: "
+                    )
+                    .strip()
+                    .lower()
+                )
+                should_copy = resp == "y"
+
+        if not should_copy:
+            print(t("settings_init_skip", filename=resource.name))
+            continue
+
+        try:
+            with as_file(resource) as actual_path:
+                shutil.copy(actual_path, target_path)
+                print(t("settings_init_copy", filename=resource.name))
+        except Exception as e:
+            print(t("settings_init_error", filename=resource.name, err=str(e)))
+            raise
+
+
+def _handle_set_lang(args: Namespace) -> None:
+    state_mgr.set_language(args.lang)
+    print(t("settings_set_lang", lang=args.lang))
+
+
+def _handle_set_config(args: Namespace) -> None:
+    try:
+        save_config_file(args.path)
+        print(t("settings_set_config", path=args.path))
+    except Exception as e:
+        print(t("settings_set_config_fail", err=str(e)))
+        raise

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/src/novel_downloader/cli/download.py

@@ -15,13 +15,13 @@ from pathlib import Path
 from typing import Any
 
 from novel_downloader.config import ConfigAdapter, load_config
-from novel_downloader.core.factory import (
+from novel_downloader.core import (
+    FetcherProtocol,
     get_downloader,
     get_exporter,
     get_fetcher,
     get_parser,
 )
-from novel_downloader.core.interfaces import FetcherProtocol
 from novel_downloader.models import BookConfig, LoginField
 from novel_downloader.utils.cookies import resolve_cookies
 from novel_downloader.utils.i18n import t
@@ -44,8 +44,6 @@ def register_download_subcommand(subparsers: _SubParsersAction) -> None:  # type
 
 
 def handle_download(args: Namespace) -> None:
-    setup_logging()
-
     site: str = args.site
     config_path: Path | None = Path(args.config) if args.config else None
     book_ids: list[BookConfig] = _cli_args_to_book_configs(
@@ -143,10 +141,11 @@ async def _download(
     fetcher_cfg = adapter.get_fetcher_config()
     parser_cfg = adapter.get_parser_config()
     exporter_cfg = adapter.get_exporter_config()
+    log_level = adapter.get_log_level()
 
     parser = get_parser(site, parser_cfg)
     exporter = get_exporter(site, exporter_cfg)
-    setup_logging()
+    setup_logging(log_level=log_level)
 
     async with get_fetcher(site, fetcher_cfg) as fetcher:
         if downloader_cfg.login_required and not await fetcher.load_state():

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/src/novel_downloader/cli/export.py

@@ -9,8 +9,9 @@ from argparse import Namespace, _SubParsersAction
 from pathlib import Path
 
 from novel_downloader.config import ConfigAdapter, load_config
-from novel_downloader.core.factory import get_exporter
+from novel_downloader.core import get_exporter
 from novel_downloader.utils.i18n import t
+from novel_downloader.utils.logger import setup_logging
 
 
 def register_export_subcommand(subparsers: _SubParsersAction) -> None:  # type: ignore
@@ -57,7 +58,9 @@ def handle_export(args: Namespace) -> None:
 
     adapter = ConfigAdapter(config=config_data, site=site)
     exporter_cfg = adapter.get_exporter_config()
+    log_level = adapter.get_log_level()
     exporter = get_exporter(site, exporter_cfg)
+    setup_logging(log_level=log_level)
 
     for book_id in book_ids:
         print(t("export_processing", book_id=book_id, format=export_format))

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/src/novel_downloader/cli/main.py

@@ -14,6 +14,7 @@ from .clean import register_clean_subcommand
 from .config import register_config_subcommand
 from .download import register_download_subcommand
 from .export import register_export_subcommand
+from .search import register_search_subcommand
 
 
 def cli_main() -> None:
@@ -24,6 +25,7 @@ def cli_main() -> None:
     register_config_subcommand(subparsers)
     register_download_subcommand(subparsers)
     register_export_subcommand(subparsers)
+    register_search_subcommand(subparsers)
 
     args = parser.parse_args()
     if hasattr(args, "func"):

novel_downloader-1.5.0/src/novel_downloader/cli/search.py

@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.cli.search
+---------------------------
+
+"""
+
+import asyncio
+from argparse import Namespace, _SubParsersAction
+from collections.abc import Sequence
+from pathlib import Path
+
+from novel_downloader.cli.download import _download
+from novel_downloader.config import ConfigAdapter, load_config
+from novel_downloader.core import search
+from novel_downloader.models import BookConfig, SearchResult
+from novel_downloader.utils.i18n import t
+
+
+def register_search_subcommand(subparsers: _SubParsersAction) -> None:  # type: ignore
+    parser = subparsers.add_parser("search", help=t("help_search"))
+
+    parser.add_argument(
+        "--site",
+        "-s",
+        action="append",
+        metavar="SITE",
+        help=t("help_search_sites"),
+    )
+    parser.add_argument(
+        "keyword",
+        help=t("help_search_keyword"),
+    )
+    parser.add_argument(
+        "--config",
+        type=str,
+        help=t("help_config"),
+    )
+    parser.add_argument(
+        "--limit",
+        "-l",
+        type=int,
+        default=10,
+        metavar="N",
+        help=t("help_search_limit"),
+    )
+    parser.add_argument(
+        "--site-limit",
+        type=int,
+        default=5,
+        metavar="M",
+        help=t("help_search_site_limit"),
+    )
+
+    parser.set_defaults(func=handle_search)
+
+
+def handle_search(args: Namespace) -> None:
+    """
+    Handler for the `search` subcommand. Loads config, runs the search,
+    prompts the user to pick one result, then kicks off download.
+    """
+    sites: Sequence[str] | None = args.site or None
+    keyword: str = args.keyword
+    overall_limit = max(1, args.limit)
+    per_site_limit = max(1, args.site_limit)
+    config_path: Path | None = Path(args.config) if args.config else None
+
+    try:
+        config_data = load_config(config_path)
+    except Exception as e:
+        print(t("download_config_load_fail", err=str(e)))
+        return
+
+    results = search(
+        keyword=keyword,
+        sites=sites,
+        limit=overall_limit,
+        per_site_limit=per_site_limit,
+    )
+
+    chosen = _prompt_user_select(results)
+    if chosen is None:
+        # user cancelled or no valid choice
+        return
+
+    adapter = ConfigAdapter(config=config_data, site=chosen["site"])
+    books: list[BookConfig] = [{"book_id": chosen["book_id"]}]
+    asyncio.run(_download(adapter, chosen["site"], books))
+
+
+def _prompt_user_select(
+    results: Sequence[SearchResult],
+    max_attempts: int = 3,
+) -> SearchResult | None:
+    """
+    Display a numbered list of results and prompt the user to pick one.
+
+    :param results:      A list of SearchResult dicts.
+    :param max_attempts: How many bad inputs to tolerate before giving up.
+    :return:             The chosen SearchResult, or None if cancelled/failed.
+    """
+    if not results:
+        print(t("no_results"))
+        return None
+
+    # Show choices
+    for i, r in enumerate(results, start=1):
+        print(f"[{i}] {r['title']} - {r['author']} ({r['site']}, id: {r['book_id']})")
+
+    attempts = 0
+    while attempts < max_attempts:
+        choice = input(t("prompt_select_index")).strip()
+        if choice == "":
+            return None
+        if choice.isdigit():
+            idx = int(choice)
+            if 1 <= idx <= len(results):
+                return results[idx - 1]
+        print(t("invalid_selection"))
+        attempts += 1
+
+    return None

{novel_downloader-1.4.4 → novel_downloader-1.5.0}/src/novel_downloader/config/__init__.py

@@ -8,20 +8,13 @@ Unified interface for loading and adapting configuration files.
 This module provides:
 - load_config: loads YAML config from file path with fallback support
 - ConfigAdapter: maps raw config + site name to structured config models
-- Configuration dataclasses: RequesterConfig, DownloaderConfig, etc.
 """
 
-from .adapter import ConfigAdapter
-from .loader import load_config, save_config_file
-from .site_rules import (
-    load_site_rules,
-    save_rules_as_json,
-)
-
 __all__ = [
     "load_config",
     "save_config_file",
     "ConfigAdapter",
-    "load_site_rules",
-    "save_rules_as_json",
 ]
+
+from .adapter import ConfigAdapter
+from .loader import load_config, save_config_file