Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: remove redundant class
NTFSvolumedac1ac19a44d
diff --git a/cyberdrop_dl/director.py b/cyberdrop_dl/director.pyindex b446264c8..74bbe4315 100644--- a/cyberdrop_dl/director.py+++ b/cyberdrop_dl/director.py@@ -12,7 +12,7 @@ from cyberdrop_dl import aio, constants, env, storagefrom cyberdrop_dl.dependencies import browser_cookie3from cyberdrop_dl.managers.manager import Managerfrom cyberdrop_dl.scraper.scrape_mapper import ScrapeMapper-from cyberdrop_dl.ui.program_ui import ProgramUI+from cyberdrop_dl.ui import program_uifrom cyberdrop_dl.updates import check_latest_pypifrom cyberdrop_dl.utils.apprise import send_apprise_notificationsfrom cyberdrop_dl.utils.logger import LogHandler, QueuedLogger, log_spacer, log_with_color@@ -180,7 +180,7 @@ def _setup_manager(args: Sequence[str] | None = None) -> Manager:manager.startup()if not manager.parsed_args.cli_only_args.download:- ProgramUI(manager).run()+ program_ui.run(manager)return managerdiff --git a/cyberdrop_dl/ui/program_ui.py b/cyberdrop_dl/ui/program_ui.pyindex 517362fae..94dd85db7 100644--- a/cyberdrop_dl/ui/program_ui.py+++ b/cyberdrop_dl/ui/program_ui.py@@ -1,7 +1,6 @@from __future__ import annotationsimport asyncio-import dataclassesimport osimport sysfrom pathlib import Path@@ -34,63 +33,6 @@ _CHANGELOG_URL = "https://raw.githubusercontent.com/NTFSvolume/cdl/refs/heads/ma_changelog: str = ""[email protected](slots=True, frozen=True)-class ProgramUI:- manager: Manager- choices: dict[str, Callable[[], bool | None]] = dataclasses.field(init=False, default_factory=dict)-- def __post_init__(self) -> None:- self.choices.update(- {- "Download": lambda: True,- "Retry failed downloads": self._retry_failed_download,- "Create file hashes": self._scan_and_create_hashes,- "Sort files in download folder": self._sort_files,- "Edit URLs.txt": self._edit_urls,- "View changelog": _view_changelog,- "Exit": lambda: sys.exit(0),- }- )-- def run(self) -> None:- while True:- _app_header(self.manager)- answer = _ask_choices(self.choices)- done = self.choices[answer]()- if done:- break-- def _retry_failed_download(self) -> bool:- self.manager.parsed_args.cli_only_args.retry_failed = True- return True-- def _scan_and_create_hashes(self) -> None:- path = _ask_dir(- "Select the directory to scan",- default=self.manager.config.files.download_folder,- )- asyncio.run(hash_directory_scanner(self.manager, path))- _enter_to_continue()-- def _sort_files(self) -> None:- sorter = Sorter.from_manager(self.manager)- _CONSOLE.print(- _WARNING,- f"You are about to sort files from '{sorter.input_dir}' to '{sorter.output_dir}'",- )- answer = _ask_text("Type 'YES' to proceed")- if answer.strip().casefold() == "yes":- asyncio.run(sorter.run())- _enter_to_continue()-- def _edit_urls(self) -> None:- try:- text_editor.open(self.manager.config.files.input_file)- except ValueError as e:- _CONSOLE.print(_ERROR, str(e))- _enter_to_continue()--def changelog() -> str:global _changelogif not _changelog:@@ -99,6 +41,59 @@ def changelog() -> str:return _changelog+def run(manager: Manager) -> None:+ choices: dict[str, Callable[[Manager], bool | None]] = {+ "Download": lambda _: True,+ "Retry failed downloads": _retry_failed_download,+ "Create file hashes": _scan_and_create_hashes,+ "Sort files in download folder": _sort_files,+ "Edit URLs.txt": _edit_urls,+ "View changelog": lambda _: _view_changelog(),+ "Exit": lambda _: sys.exit(0),+ }++ while True:+ _app_header(manager)+ answer = _ask_choices(choices)+ done = choices[answer](manager)+ if done:+ break+++def _retry_failed_download(manager: Manager) -> bool:+ manager.parsed_args.cli_only_args.retry_failed = True+ return True+++def _scan_and_create_hashes(manager: Manager) -> None:+ path = _ask_dir(+ "Select the directory to scan",+ default=manager.config.files.download_folder,+ )+ asyncio.run(hash_directory_scanner(manager, path))+ _enter_to_continue()+++def _sort_files(manager: Manager) -> None:+ sorter = Sorter.from_manager(manager)+ _CONSOLE.print(+ _WARNING,+ f"You are about to sort files from '{sorter.input_dir}' to '{sorter.output_dir}'",+ )+ answer = _ask_text("Type 'YES' to proceed")+ if answer.strip().casefold() == "yes":+ asyncio.run(sorter.run())+ _enter_to_continue()+++def _edit_urls(manager: Manager) -> None:+ try:+ text_editor.open(manager.config.files.input_file)+ except ValueError as e:+ _CONSOLE.print(_ERROR, str(e))+ _enter_to_continue()++async def _fetch_changelog() -> str:async with aiohttp.request("GET",diff --git a/tests/test_startup.py b/tests/test_startup.pyindex c0175aa8e..d81d893a5 100644--- a/tests/test_startup.py+++ b/tests/test_startup.py@@ -3,7 +3,7 @@ from pathlib import Pathimport pytestfrom cyberdrop_dl.main import run-from cyberdrop_dl.ui.program_ui import ProgramUI+from cyberdrop_dl.ui import program_uidef test_startup(tmp_cwd: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:@@ -13,7 +13,7 @@ def test_startup(tmp_cwd: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.def main_ui(*_) -> None:print(msg)- monkeypatch.setattr(ProgramUI, "run", main_ui)+ monkeypatch.setattr(program_ui, "run", main_ui)run(())captured = capsys.readouterr()output = captured.out