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

novel_downloader/tui/__init__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui
+--------------------
+
+This module exposes the TUI entry point.
+"""

novel_downloader/tui/app.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui.app
+------------------------
+
+"""
+
+from typing import Any
+
+from textual.app import App, ComposeResult
+from textual.containers import Container
+from textual.widgets import Footer, Header
+
+from novel_downloader.config import load_config
+from novel_downloader.tui.screens import HomeScreen
+
+
+class NovelDownloaderTUI(App):  # type: ignore[misc]
+    TITLE = "Novel Downloader TUI"
+    SCREENS = {
+        "home": HomeScreen,
+    }
+    config: dict[str, Any]
+
+    def compose(self) -> ComposeResult:
+        yield Header()
+        yield Container(id="main_area")
+        yield Footer()
+
+    def on_mount(self) -> None:
+        self.config = load_config()
+        self.push_screen("home")

novel_downloader/tui/main.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui.main
+-------------------------
+
+"""
+
+from novel_downloader.tui.app import NovelDownloaderTUI
+
+
+def tui_main() -> None:
+    app = NovelDownloaderTUI()
+    app.run()
+
+
+if __name__ == "__main__":
+    tui_main()

novel_downloader/tui/screens/__init__.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui.screens
+----------------------------
+
+"""
+
+from .home import HomeScreen
+from .login import LoginScreen
+
+__all__ = [
+    "HomeScreen",
+    "LoginScreen",
+]

novel_downloader/tui/screens/home.py

@@ -0,0 +1,191 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui.screens.home
+---------------------------------
+
+"""
+
+import asyncio
+import logging
+from typing import Any
+
+from textual.app import ComposeResult
+from textual.containers import Horizontal, Vertical
+from textual.screen import Screen
+from textual.widgets import Button, Input, ProgressBar, RichLog, Select, Static
+
+from novel_downloader.config import ConfigAdapter
+from novel_downloader.core.factory import (
+    get_downloader,
+    get_exporter,
+    get_fetcher,
+    get_parser,
+)
+from novel_downloader.core.interfaces import FetcherProtocol
+from novel_downloader.models import LoginField
+from novel_downloader.tui.widgets.richlog_handler import RichLogHandler
+from novel_downloader.utils.i18n import t
+
+
+class HomeScreen(Screen):  # type: ignore[misc]
+    CSS_PATH = "../styles/home_layout.tcss"
+
+    def compose(self) -> ComposeResult:
+        yield Vertical(
+            self._make_title_bar(),
+            self._make_input_row(),
+            ProgressBar(id="prog", name="下载进度"),
+            Static("下载进度: 0/0 章", id="label-progress"),
+            RichLog(id="log", highlight=True, markup=False),
+            id="main-layout",
+        )
+
+    def on_mount(self) -> None:
+        log_widget = self.query_one("#log", RichLog)
+
+        self._log_handler = RichLogHandler(log_widget)
+        self._log_handler.setLevel(logging.INFO)
+        self._log_handler.setFormatter(logging.Formatter("[%(levelname)s] %(message)s"))
+
+        self._setup_logging(self._log_handler)
+
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
+        if event.button.id == "exit":
+            logging.info("退出应用")
+            self.app.exit()
+
+        elif event.button.id == "settings":
+            logging.info("设置功能暂未实现")
+
+        elif event.button.id == "download":
+            site = self.query_one("#site", Select).value
+            ids = self.query_one("#book_ids", Input).value
+            if not site or not ids.strip():
+                logging.warning("请填写完整信息")
+                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))
+
+    def _make_title_bar(self) -> Horizontal:
+        return Horizontal(
+            Static("小说下载器", id="title"),
+            Button("设置", id="settings"),
+            Button("关闭", id="exit"),
+            id="title-bar",
+        )
+
+    def _make_input_row(self) -> Horizontal:
+        return Horizontal(
+            Vertical(self._make_site_select(), classes="left"),
+            Vertical(
+                Input(placeholder="输入书籍ID (支持逗号分隔)", id="book_ids"),
+                classes="middle",
+            ),
+            Vertical(Button("下载", id="download"), classes="right"),
+            id="input-row",
+        )
+
+    def _make_site_select(self) -> Select:
+        return Select(
+            options=[
+                ("起点中文网", "qidian"),
+                ("笔趣阁", "biquge"),
+                ("铅笔小说", "qianbi"),
+                ("SF轻小说", "sfacg"),
+                ("ESJ Zone", "esjzone"),
+                ("百合会", "yamibo"),
+                ("哔哩轻小说", "linovelib"),
+            ],
+            prompt="选择站点",
+            value="qidian",
+            id="site",
+        )
+
+    async def _download(
+        self,
+        adapter: ConfigAdapter,
+        site: str,
+        valid_book_ids: set[str],
+    ) -> None:
+        btn = self.query_one("#download", Button)
+        btn.disabled = True
+        try:
+            logging.info(f"下载请求: {site} | {valid_book_ids}")
+            downloader_cfg = adapter.get_downloader_config()
+            fetcher_cfg = adapter.get_fetcher_config()
+            parser_cfg = adapter.get_parser_config()
+            exporter_cfg = adapter.get_exporter_config()
+
+            parser = get_parser(site, parser_cfg)
+            exporter = get_exporter(site, exporter_cfg)
+            self._setup_logging(self._log_handler)
+
+            async with get_fetcher(site, fetcher_cfg) as fetcher:
+                if downloader_cfg.login_required and not await fetcher.load_state():
+                    login_data = await self._prompt_login_fields(
+                        fetcher, fetcher.login_fields, downloader_cfg
+                    )
+                    if not await fetcher.login(**login_data):
+                        logging.info(t("download_login_failed"))
+                        return
+                    await fetcher.save_state()
+
+                downloader = get_downloader(
+                    fetcher=fetcher,
+                    parser=parser,
+                    exporter=exporter,
+                    site=site,
+                    config=downloader_cfg,
+                )
+
+                for book_id in valid_book_ids:
+                    logging.info(t("download_downloading", book_id=book_id, site=site))
+                    await downloader.download(
+                        book_id, progress_hook=self._update_progress
+                    )
+
+                if downloader_cfg.login_required and fetcher.is_logged_in:
+                    await fetcher.save_state()
+        finally:
+            btn.disabled = False
+
+    async def _prompt_login_fields(
+        self,
+        fetcher: FetcherProtocol,
+        fields: list[LoginField],
+        cfg: Any = None,
+    ) -> dict[str, Any]:
+        """
+        Push a LoginScreen to collect all required fields,
+        then return the dict of values when the user submits.
+        """
+        # cfg_dict = asdict(cfg) if cfg else {}
+        # login_screen = LoginScreen(fields, cfg_dict)
+        # await self.app.push_screen(login_screen)
+        # await self.app.pop_screen()
+        return {}
+
+    def _setup_logging(self, handler: logging.Handler) -> None:
+        """
+        Attach the given handler to the root logger.
+        """
+        ft_logger = logging.getLogger("fontTools.ttLib.tables._p_o_s_t")
+        ft_logger.setLevel(logging.ERROR)
+        ft_logger.propagate = False
+
+        logger = logging.getLogger()
+        logger.setLevel(logging.INFO)
+
+        logger.handlers = [
+            h for h in logger.handlers if not isinstance(h, RichLogHandler)
+        ]
+        logger.addHandler(handler)
+
+    async def _update_progress(self, done: int, total: int) -> None:
+        prog = self.query_one("#prog", ProgressBar)
+        label = self.query_one("#label-progress", Static)
+
+        prog.update(total=total, progress=min(done, total))
+
+        label.update(f"下载进度: {done}/{total} 章")

novel_downloader/tui/screens/login.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui.screens.login
+---------------------------------
+
+"""
+
+from typing import Any
+
+from textual.app import ComposeResult
+from textual.containers import Vertical
+from textual.screen import Screen
+from textual.widgets import Button, Input, Static
+
+from novel_downloader.models import LoginField
+
+
+class LoginScreen(Screen):  # type: ignore[misc]
+    """
+    A modal screen that gathers login fields, then fires LoginScreen.Submitted.
+    """
+
+    BINDINGS = [("escape", "app.pop_screen", "取消")]
+
+    def __init__(
+        self,
+        fields: list[LoginField],
+        cfg: dict[str, Any] | None = None,
+    ) -> None:
+        super().__init__()
+        self.fields = fields
+        self.cfg = cfg or {}
+
+    def compose(self) -> ComposeResult:
+        widgets = []
+        for field in self.fields:
+            # show label and optional description
+            widgets.append(Static(field.label))
+            if field.description:
+                widgets.append(Static(f"[i]{field.description}[/]"))
+
+            # pick input type
+            if field.type == "password":
+                inp = Input(
+                    placeholder=field.placeholder or "",
+                    password=True,
+                    id=field.name,
+                )
+            else:
+                inp = Input(
+                    placeholder=field.placeholder or "",
+                    id=field.name,
+                )
+
+            # pre-fill from config if present
+            existing = self.cfg.get(field.name, "").strip()
+            if existing:
+                inp.value = existing
+
+            widgets.append(inp)
+
+        # submit button at the end
+        widgets.append(Button("提交", id="submit"))
+        yield Vertical(*widgets, id="login-form")
+
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
+        if event.button.id == "submit":
+            data: dict[str, Any] = {}
+            for field in self.fields:
+                inp = self.query_one(f"#{field.name}", Input)
+                value = inp.value
+                if not value and self.cfg.get(field.name):
+                    value = self.cfg[field.name]
+                data[field.name] = value

novel_downloader/tui/styles/home_layout.tcss

@@ -0,0 +1,79 @@
+#main-layout {
+    grid-rows: 3 auto 1 auto 1fr;
+    grid-columns: 1fr;
+    grid-gutter: 1;
+    padding: 1;
+    height: 100%;
+}
+
+#title-bar {
+    height: 3;
+    layout: horizontal;
+    align: left middle;
+    padding: 0 1;
+    background: $boost;
+}
+
+#title {
+    width: 1fr;
+    content-align: left middle;
+}
+
+#settings,
+#exit {
+    width: 8;
+    padding: 0 1;
+}
+
+#input-row {
+    layout: horizontal;
+    padding: 1 0;
+    overflow-x: auto;
+}
+
+#site {
+    width: 20;
+    margin-right: 1;
+}
+
+#book_ids {
+    width: 1fr;
+    min-width: 0;
+    margin-right: 1;
+}
+
+#download {
+    width: 15;
+}
+
+#site,
+#book_ids,
+#download {
+    width: 100%;
+}
+
+Button#download {
+    border: round $accent;
+    padding: 0 1;
+}
+Button#download:hover {
+    background: $accent-lighten-3;
+    color: $text;
+}
+
+
+#prog {
+    height: 1;
+    color: $success;
+}
+
+#label {
+    content-align: left middle;
+    padding-left: 1;
+}
+
+#log {
+    border: round $primary;
+    padding: 1;
+    overflow-y: auto;
+}

novel_downloader/tui/widgets/richlog_handler.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.tui.widgets.richlog_handler
+--------------------------------------------
+
+"""
+
+import logging
+from logging import LogRecord
+
+from textual.widgets import RichLog
+
+
+class RichLogHandler(logging.Handler):
+    def __init__(self, rich_log_widget: RichLog):
+        super().__init__()
+        self.rich_log_widget = rich_log_widget
+
+    def emit(self, record: LogRecord) -> None:
+        msg = self.format(record)
+        try:
+            self.rich_log_widget.write(msg)
+        except Exception:
+            self.handleError(record)

novel_downloader/utils/__init__.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.utils
+----------------------
+
+"""

novel_downloader/utils/chapter_storage.py

@@ -12,7 +12,13 @@ import json
 import sqlite3
 import types
 from pathlib import Path
-from typing import Any, Literal, Self, TypedDict, cast
+from typing import Any, Self, cast
+
+from novel_downloader.models import (
+    ChapterDict,
+    SaveMode,
+    StorageBackend,
+)
 
 from .file_utils import save_as_json
 
@@ -26,27 +32,6 @@ CREATE TABLE IF NOT EXISTS "{table}" (
 """
 
 
-class ChapterDict(TypedDict, total=True):
-    """
-    TypedDict for a novel chapter.
-
-    Fields:
-        id      -- Unique chapter identifier
-        title   -- Chapter title
-        content -- Chapter text
-        extra   -- Arbitrary metadata (e.g. author remarks, timestamps)
-    """
-
-    id: str
-    title: str
-    content: str
-    extra: dict[str, Any]
-
-
-BackendType = Literal["json", "sqlite"]
-SaveMode = Literal["overwrite", "skip"]
-
-
 class ChapterStorage:
     """
     Manage storage of chapters in JSON files or an SQLite database.
@@ -60,7 +45,7 @@ class ChapterStorage:
         self,
         raw_base: str | Path,
         namespace: str,
-        backend_type: BackendType = "json",
+        backend_type: StorageBackend = "json",
         *,
         batch_size: int = 1,
     ) -> None:
@@ -70,6 +55,7 @@ class ChapterStorage:
         self._batch_size = batch_size
         self._pending = 0
         self._conn: sqlite3.Connection | None = None
+        self._existing_ids: set[str] = set()
 
         if self.backend == "json":
             self._init_json()
@@ -80,6 +66,7 @@ class ChapterStorage:
         """Prepare directory for JSON files."""
         self._json_dir = self.raw_base / self.namespace
         self._json_dir.mkdir(parents=True, exist_ok=True)
+        self._existing_ids = {p.stem for p in self._json_dir.glob("*.json")}
 
     def _init_sql(self) -> None:
         """Prepare SQLite connection and ensure table exists."""
@@ -89,21 +76,13 @@ class ChapterStorage:
         self._conn.execute(stmt)
         self._conn.commit()
 
+        cur = self._conn.execute(f'SELECT id FROM "{self.namespace}"')
+        self._existing_ids = {row[0] for row in cur.fetchall()}
+
     def _json_path(self, chap_id: str) -> Path:
         """Return Path for JSON file of given chapter ID."""
         return self._json_dir / f"{chap_id}.json"
 
-    def _exists_json(self, chap_id: str) -> bool:
-        return self._json_path(chap_id).is_file()
-
-    def _exists_sql(self, chap_id: str) -> bool:
-        if self._conn is None:
-            raise RuntimeError("ChapterStorage is closed")
-        cur = self._conn.execute(
-            f'SELECT 1 FROM "{self.namespace}" WHERE id = ? LIMIT 1', (chap_id,)
-        )
-        return cur.fetchone() is not None
-
     def exists(self, chap_id: str) -> bool:
         """
         Check if a chapter exists.
@@ -111,10 +90,7 @@ class ChapterStorage:
         :param chap_id: Chapter identifier.
         :return: True if found, else False.
         """
-        if self.backend == "json":
-            return self._exists_json(chap_id)
-        else:
-            return self._exists_sql(chap_id)
+        return chap_id in self._existing_ids
 
     def _load_json(self, chap_id: str) -> ChapterDict:
         raw = self._json_path(chap_id).read_text(encoding="utf-8")
@@ -153,6 +129,7 @@ class ChapterStorage:
     def _save_json(self, data: ChapterDict, on_exist: SaveMode) -> None:
         path = self._json_path(data["id"])
         save_as_json(data, path, on_exist=on_exist)
+        self._existing_ids.add(data["id"])
 
     def _save_sql(self, data: ChapterDict, on_exist: SaveMode) -> None:
         if self._conn is None:
@@ -173,6 +150,7 @@ class ChapterStorage:
                 json.dumps(data["extra"], ensure_ascii=False),
             ),
         )
+        self._existing_ids.add(data["id"])
         if self._batch_size == 1:
             self._conn.commit()
         else:
@@ -218,6 +196,8 @@ class ChapterStorage:
         with self._conn:
             self._conn.executemany(sql, params)
 
+        self._existing_ids.update(data["id"] for data in datas)
+
     def save(
         self,
         data: ChapterDict,
@@ -338,3 +318,10 @@ class ChapterStorage:
 
     def __del__(self) -> None:
         self.close()
+
+    def __repr__(self) -> str:
+        return (
+            f"<ChapterStorage ns='{self.namespace}' "
+            f"backend='{self.backend}' "
+            f"path='{self.raw_base}'>"
+        )

novel_downloader/utils/constants.py

@@ -9,7 +9,7 @@ Constants and default paths used throughout the NovelDownloader project.
 from importlib.resources import files
 from pathlib import Path
 
-from platformdirs import user_config_dir
+from platformdirs import user_config_path
 
 # -----------------------------------------------------------------------------
 # Application identity
@@ -20,15 +20,20 @@ APP_DIR_NAME = "novel_downloader"  # Directory name for platformdirs
 LOGGER_NAME = PACKAGE_NAME  # Root logger name
 
 SUPPORTED_SITES = {
-    "qidian",
     "biquge",
+    "esjzone",
+    "linovelib",
+    "qianbi",
+    "qidian",
+    "sfacg",
+    "yamibo",
 }
 
 # -----------------------------------------------------------------------------
 # Base directories
 # -----------------------------------------------------------------------------
 # Base config directory (e.g. ~/AppData/Local/novel_downloader/)
-BASE_CONFIG_DIR = Path(user_config_dir(APP_DIR_NAME, appauthor=False))
+BASE_CONFIG_DIR = Path(user_config_path(APP_DIR_NAME, appauthor=False))
 WORK_DIR = Path.cwd()
 PACKAGE_ROOT: Path = Path(__file__).parent.parent
 LOCALES_DIR: Path = PACKAGE_ROOT / "locales"
@@ -79,11 +84,9 @@ DEFAULT_USER_HEADERS = {
 # Embedded resources (via importlib.resources)
 # -----------------------------------------------------------------------------
 BASE_CONFIG_PATH = files("novel_downloader.resources.config").joinpath("settings.toml")
-BASE_RULE_PATH = files("novel_downloader.resources.config").joinpath("rules.toml")
 
 DEFAULT_SETTINGS_PATHS = [
     BASE_CONFIG_PATH,
-    BASE_RULE_PATH,
 ]
 
 # CSS Styles
@@ -101,6 +104,9 @@ VOLUME_BORDER_IMAGE_PATH = files("novel_downloader.resources.images").joinpath(
 REPLACE_WORD_MAP_PATH = files("novel_downloader.resources.json").joinpath(
     "replace_word_map.json"
 )
+LINOVELIB_FONT_MAP_PATH = files("novel_downloader.resources.json").joinpath(
+    "linovelib_font_map.json"
+)
 
 # JavaScript
 QD_DECRYPT_SCRIPT_PATH = files("novel_downloader.resources.js_scripts").joinpath(