novel-downloader 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

novel_downloader/__init__.py

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

novel_downloader/cli/download.py

@@ -155,7 +155,7 @@ async def _download(
     exporter_cfg = adapter.get_exporter_config()
     login_cfg = adapter.get_login_config()
     log_level = adapter.get_log_level()
-    setup_logging(log_level=log_level)
+    setup_logging(console_level=log_level)
 
     parser = get_parser(site, parser_cfg)
     exporter = None
@@ -178,7 +178,14 @@ async def _download(
 
         for book in valid_books:
             ui.info(t("download_downloading", book_id=book["book_id"], site=site))
-            await downloader.download(book, progress_hook=_print_progress)
+
+            hook, close = ui.create_progress_hook(
+                prefix=t("download_progress_prefix"), unit="chapters"
+            )
+            try:
+                await downloader.download(book, progress_hook=hook)
+            finally:
+                close()
 
             if not no_export and exporter is not None:
                 await asyncio.to_thread(exporter.export, book["book_id"])
@@ -186,6 +193,9 @@ async def _download(
         if downloader_cfg.login_required and fetcher.is_logged_in:
             await fetcher.save_state()
 
+    if exporter is not None:
+        exporter.close()
+
 
 async def _prompt_login_fields(
     fields: list[LoginField],
@@ -214,8 +224,8 @@ async def _prompt_login_fields(
             ui.info(t("login_use_config"))
             continue
 
-        value: str | dict[str, str]
-        while True:
+        value: str | dict[str, str] = ""
+        for _ in range(5):
             if field.type == "password":
                 value = ui.prompt_password(t("login_enter_password"))
             elif field.type == "cookie":
@@ -235,10 +245,3 @@ async def _prompt_login_fields(
         result[field.name] = value
 
     return result
-
-
-async def _print_progress(done: int, total: int) -> None:
-    """Progress hook passed into the downloader."""
-    ui.print_progress(
-        done, total, prefix=t("download_progress_prefix"), unit="chapters"
-    )

novel_downloader/cli/export.py

@@ -55,22 +55,22 @@ 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:
-        ui.info(t("export_processing", book_id=book_id, format=export_format))
-
-        if export_format in {"txt", "all"}:
-            try:
-                exporter.export_as_txt(book_id)
-                ui.success(t("export_success_txt", book_id=book_id))
-            except Exception as e:
-                ui.error(t("export_failed_txt", book_id=book_id, err=str(e)))
-
-        if export_format in {"epub", "all"}:
-            try:
-                exporter.export_as_epub(book_id)
-                ui.success(t("export_success_epub", book_id=book_id))
-            except Exception as e:
-                ui.error(t("export_failed_epub", book_id=book_id, err=str(e)))
+    setup_logging(console_level=log_level)
+
+    with get_exporter(site, exporter_cfg) as exporter:
+        for book_id in book_ids:
+            ui.info(t("export_processing", book_id=book_id, format=export_format))
+
+            if export_format in {"txt", "all"}:
+                try:
+                    exporter.export_as_txt(book_id)
+                    ui.success(t("export_success_txt", book_id=book_id))
+                except Exception as e:
+                    ui.error(t("export_failed_txt", book_id=book_id, err=str(e)))
+
+            if export_format in {"epub", "all"}:
+                try:
+                    exporter.export_as_epub(book_id)
+                    ui.success(t("export_success_epub", book_id=book_id))
+                except Exception as e:
+                    ui.error(t("export_failed_epub", book_id=book_id, err=str(e)))

novel_downloader/cli/ui.py

@@ -7,19 +7,20 @@ A small set of Rich-based helpers to keep CLI presentation and prompts
 consistent across subcommands.
 
 Public API:
-- info, success, warn, error
-- confirm
-- prompt, prompt_password
-- render_table
-- select_index
-- print_progress
+  * info, success, warn, error
+  * confirm
+  * prompt, prompt_password
+  * render_table
+  * select_index
+  * print_progress
 """
 
 from __future__ import annotations
 
-from collections.abc import Iterable, Sequence
+from collections.abc import Awaitable, Callable, Iterable, Sequence
 
 from rich.console import Console
+from rich.progress import Progress, TaskID
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
@@ -71,7 +72,7 @@ def prompt(message: str, *, default: str | None = None) -> str:
     :return: The user's input.
     """
     try:
-        result: str = Prompt.ask(message, default=default or "")
+        result: str = Prompt.ask(message, default=default or "", show_default=False)
         return result
     except (KeyboardInterrupt, EOFError):
         warn("Cancelled.")
@@ -154,3 +155,29 @@ def print_progress(
     total = max(1, total)
     pct = done / total * 100.0
     _CONSOLE.print(f"[dim]{prefix}[/] {done}/{total} {unit} ({pct:.2f}%)")
+
+
+def create_progress_hook(
+    prefix: str = "Progress",
+    unit: str = "item",
+) -> tuple[Callable[[int, int], Awaitable[None]], Callable[[], None]]:
+    progress = Progress(console=_CONSOLE)
+    task_id: TaskID | None = None
+
+    async def hook(done: int, total: int) -> None:
+        nonlocal task_id
+        if task_id is None:
+            progress.start()
+            task_id = progress.add_task(f"[cyan]{prefix}[/]", total=max(1, total))
+
+        progress.update(
+            task_id,
+            completed=done,
+            total=max(1, total),
+            description=f"{prefix} ({done}/{total} {unit})",
+        )
+
+    def close() -> None:
+        progress.stop()
+
+    return hook, close