Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
fix: UI options being ignored (#1744)
NTFSvolume615683b52dd6
diff --git a/cyberdrop_dl/__main__.py b/cyberdrop_dl/__main__.pyindex 3935a15a1..c40a1a7fa 100644--- a/cyberdrop_dl/__main__.py+++ b/cyberdrop_dl/__main__.py@@ -1,7 +1,7 @@# ruff: noqa: E402from rich.traceback import install as install_rich_tracebacks-from cyberdrop_dl.progress import REFRESH_RATE+from cyberdrop_dl.progress import REFRESH_RATE, TUI_DISABLED_ = install_rich_tracebacks(width=None)@@ -30,6 +30,8 @@ async def _scrape(manager: Manager) -> None:with setup_file_logging(manager.config.settings.logs.main_log):await manager.async_startup()REFRESH_RATE.set(manager.config.global_settings.ui_options.refresh_rate)+ TUI_DISABLED.set(manager.cli_args.ui.is_disabled)+log_spacer()async with manager.database:log_spacer()diff --git a/cyberdrop_dl/cli.py b/cyberdrop_dl/cli.pyindex a6eb8824c..50ce1cebf 100644--- a/cyberdrop_dl/cli.py+++ b/cyberdrop_dl/cli.py@@ -1,21 +1,26 @@import datetimefrom collections.abc import Iterable-from enum import StrEnum, auto+from enum import autofrom pathlib import Pathfrom typing import Annotated, Any, Literal, Selffrom cyclopts import Parameterfrom pydantic import BaseModel, Field, computed_field, field_validator, model_validator+from cyberdrop_dl.compat import CIStrEnumfrom cyberdrop_dl.models.types import HttpURL-class UIOptions(StrEnum):+class UIOptions(CIStrEnum):DISABLED = auto()ACTIVITY = auto()SIMPLE = auto()FULLSCREEN = auto()+ @property+ def is_disabled(self) -> bool:+ return self is UIOptions.DISABLED+@Parameter(name="*")class CLIargs(BaseModel):diff --git a/cyberdrop_dl/progress/__init__.py b/cyberdrop_dl/progress/__init__.pyindex e6af7297a..1b4e15eef 100644--- a/cyberdrop_dl/progress/__init__.py+++ b/cyberdrop_dl/progress/__init__.py@@ -20,7 +20,7 @@ if TYPE_CHECKING:from rich.console import RenderableType-REFRESH_RATE: ContextVar[float] = ContextVar("REFRESH_RATE", default=10)+REFRESH_RATE: ContextVar[float] = ContextVar("REFRESH_RATE", default=10.0)TUI_DISABLED: ContextVar[bool] = ContextVar("TUI_DISABLED", default=False)diff --git a/cyberdrop_dl/progress/scraping/__init__.py b/cyberdrop_dl/progress/scraping/__init__.pyindex 7d0914bbf..a0e7e8d88 100644--- a/cyberdrop_dl/progress/scraping/__init__.py+++ b/cyberdrop_dl/progress/scraping/__init__.py@@ -8,9 +8,11 @@ from contextvars import ContextVarfrom typing import TYPE_CHECKING, Finalimport rich+from rich.console import Group, RenderableTypefrom rich.layout import Layoutfrom cyberdrop_dl import env+from cyberdrop_dl.cli import UIOptionsfrom cyberdrop_dl.progress import LiveUIfrom cyberdrop_dl.progress.scraping.downloads import DownloadsPanelfrom cyberdrop_dl.progress.scraping.errors import DownloadErrorsPanel, ScrapeErrorsPanel@@ -36,8 +38,9 @@ class Screen:return self.vertical if terminal_is_in_portrait() else self.horizontal[email protected](slots=True, frozen=True)[email protected](slots=True)class ScrapingUI(LiveUI):+ mode: UIOptions = UIOptions.FULLSCREENfiles: FileStatsPanel = dataclasses.field(default_factory=FileStatsPanel)scrape_errors: ScrapeErrorsPanel = dataclasses.field(default_factory=ScrapeErrorsPanel)download_errors: DownloadErrorsPanel = dataclasses.field(default_factory=DownloadErrorsPanel)@@ -48,16 +51,23 @@ class ScrapingUI(LiveUI):_screen: Screen = dataclasses.field(init=False)def __post_init__(self) -> None:- object.__setattr__(self, "_screen", self._create_screen())+ self._screen = self._create_screen()++ def __rich__(self) -> RenderableType:+ if self.mode is UIOptions.SIMPLE:+ return Group(self.files.simple, self.status)+ if self.mode is UIOptions.ACTIVITY:+ return self.status- def __rich__(self) -> Screen:return self._screen@contextlib.contextmanager- def __call__(self, *, transient: bool = True) -> Generator[None]:+ def __call__(self, *, transient: bool = True, force: bool = False) -> Generator[None]:token = _STATUS.set(self.status)+ if self.mode is not UIOptions.FULLSCREEN:+ transient = Falsetry:- with super(ScrapingUI, self).__call__(transient=transient):+ with super(ScrapingUI, self).__call__(transient=transient, force=force):yieldfinally:_STATUS.reset(token)diff --git a/cyberdrop_dl/progress/scraping/files.py b/cyberdrop_dl/progress/scraping/files.pyindex 7708d1ed9..29727a0c5 100644--- a/cyberdrop_dl/progress/scraping/files.py+++ b/cyberdrop_dl/progress/scraping/files.py@@ -44,8 +44,8 @@ class FileStatsPanel:self._stats = FileStats()self._total: int = 0self._tasks_map: dict[str, TaskID] = dict(self._init_tasks())- self.simple: Progress = Progress(*columns)- self._tasks_map["simple"] = self.simple.add_task("Completed", total=0)+ self._simple: Progress = Progress(*columns)+ self._tasks_map["simple"] = self._simple.add_task("Completed", total=1)self._panel: Panel = Panel(self._progress,title="Files",@@ -64,17 +64,25 @@ class FileStatsPanel:yield name, self._progress.add_task(f"[{color}]{desc}", total=1)def __rich__(self) -> Panel:+ self._refresh()+ return self._panel++ @property+ def simple(self) -> Progress:+ self._refresh()+ return self._simple++ def _refresh(self) -> None:current_total = self._stats.totalif current_total != self._total:for name, task_id in self._tasks_map.items():if name == "simple":- self.simple.update(task_id, total=current_total, completed=current_total - self.stats.queued)+ self._simple.update(task_id, total=current_total, completed=current_total - self._stats.queued)else:self._progress.update(task_id, total=current_total, completed=getattr(self._stats, name))self._total = current_totalself._panel.subtitle = f"Total: [white]{current_total:,}"- return self._panel@propertydef stats(self) -> FileStats:diff --git a/cyberdrop_dl/scrape_mapper.py b/cyberdrop_dl/scrape_mapper.pyindex 952f1bbac..fbf1eafbb 100644--- a/cyberdrop_dl/scrape_mapper.py+++ b/cyberdrop_dl/scrape_mapper.py@@ -167,7 +167,7 @@ class ScrapeMapper:_ = filepath.MAX_FOLDER_LEN.set(self.manager.config.global_settings.general.max_folder_name_length)await self.manager.client_manager.load_cookie_files()-+ self.tui.mode = self.manager.cli_args.ui## IMPORTANT: Order of each context matters!with self.tui():async with (