Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: remove tox as explicit dependency (#1826)
NTFSvolume8badbe151d29
diff --git a/cyberdrop_dl/cli.py b/cyberdrop_dl/cli.pydeleted file mode 100644index 160cb16d8..000000000--- a/cyberdrop_dl/cli.py+++ /dev/null@@ -1,131 +0,0 @@-import datetime-from collections.abc import Iterable-from enum import auto-from pathlib import Path-from typing import Annotated, Any, Literal, Self--from cyclopts import Parameter-from pydantic import BaseModel, Field, computed_field, field_validator, model_validator--from cyberdrop_dl.compat import CIStrEnum-from cyberdrop_dl.models.types import HttpURL---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):- links: Annotated[tuple[HttpURL, ...], Parameter(show=False)] = Field(- default=(),- description="link(s) to content to download (passing multiple links is supported)",- )- appdata_folder: Path | None = Field(- default=None,- description="AppData folder path",- )- completed_after: datetime.date | None = Field(- default=None,- description="only retry downloads that were completed on or after this date",- )- completed_before: datetime.date | None = Field(- default=None,- description="only retry downloads that were completed on or before this date",- )-- config_file: Path | None = Field(- default=None,- description="path to the CDL settings.yaml file to load",- )-- download: bool = Field(- default=False,- description="skips UI, start download immediately",- )- download_tiktok_audios: bool = Field(- default=False,- description="download TikTok audios from posts and save them as separate files",- )- download_tiktok_src_quality_videos: bool = Field(- default=False,- description="download TikTok videos in source quality",- )- impersonate: (- Literal[- "chrome",- "edge",- "safari",- "safari_ios",- "chrome_android",- "firefox",- ]- | None- ) = Field(- default=None,- description="Use this target as impersonation for all scrape requests",- )- max_items_retry: int = Field(- default=0,- description="max number of links to retry",- )- portrait: bool = Field(- default=False,- description="force CDL to run with a vertical layout",- )- print_stats: bool = Field(- default=True,- description="show stats report at the end of a run",- )- retry_all: bool = Field(- default=False,- description="retry all downloads",- )- retry_failed: bool = Field(- default=False,- description="retry failed downloads",- )- retry_maintenance: bool = Field(- default=False,- description="retry download of maintenance files (bunkr). Requires files to be hashed",- )- ui: UIOptions = Field(- default=UIOptions.FULLSCREEN,- description="DISABLED, ACTIVITY, SIMPLE or FULLSCREEN",- )-- @property- def retry_any(self) -> bool:- return any((self.retry_all, self.retry_failed, self.retry_maintenance))-- @property- def fullscreen_ui(self) -> bool:- return self.ui == UIOptions.FULLSCREEN-- @computed_field- def __computed__(self) -> dict[str, bool]:- return {"retry_any": self.retry_any, "fullscreen_ui": self.fullscreen_ui}-- @model_validator(mode="after")- def mutually_exclusive(self) -> Self:- group1 = [self.links, self.retry_all, self.retry_failed, self.retry_maintenance]- msg1 = "`--links`, '--retry-all', '--retry-maintenace' and '--retry-failed' are mutually exclusive"- _check_mutually_exclusive(group1, msg1)- return self-- @field_validator("ui", mode="before")- @classmethod- def lower(cls, value: str) -> str:- return value.lower()---def _check_mutually_exclusive(group: Iterable[Any], msg: str) -> None:- if sum(1 for value in group if value) >= 2:- raise ValueError(msg)diff --git a/pyproject.toml b/pyproject.tomlindex 228b18354..219096929 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -53,7 +53,7 @@ license-files = ["LICENSE"]maintainers = [{name = "NTFSvolume", email = "[email protected]"}]readme = "README.md"requires-python = ">=3.11"-version = "9.9.0"+version = "9.9.1.dev0"[project.optional-dependencies]apprise = [@@ -82,8 +82,7 @@ dev = ["pytest-asyncio>=1.3.0","pytest-cov>=7.1.0","pytest>=9.0.3",- "ruff==0.15.6",- "tox>=4.53.0"+ "ruff==0.15.6"][tool.basedpyright]diff --git a/tox.ini b/tox.iniindex 6cddb2aaa..a06f5d47d 100644--- a/tox.ini+++ b/tox.ini@@ -1,8 +1,7 @@[tox]-envlist = py311, py312, py313, py314+envlist = py312, py313, py314[testenv]-allowlist_externals = poetrycommands_pre =uv sync --all-extrascommands =diff --git a/uv.lock b/uv.lockindex 71093d1fe..58a367c3c 100644--- a/uv.lock+++ b/uv.lock@@ -404,15 +404,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/b5/d3/b07f8f125ac52bbee5dc00ef0d526f820f67321bf4184f915f17f50a4657/brotlicffi-1.2.0.0-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:3832c66e00d6d82087f20a972b2fc03e21cd99ef22705225a6f8f418a9158ecc", size = 374730, upload-time = "2025-11-21T18:17:56.334Z" },]-[[package]]-name = "cachetools"-version = "7.0.5"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/af/dd/57fe3fdb6e65b25a5987fd2cdc7e22db0aef508b91634d2e57d22928d41b/cachetools-7.0.5.tar.gz", hash = "sha256:0cd042c24377200c1dcd225f8b7b12b0ca53cc2c961b43757e774ebe190fd990", size = 37367, upload-time = "2026-03-09T20:51:29.451Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/06/f3/39cf3367b8107baa44f861dc802cbf16263c945b62d8265d36034fc07bea/cachetools-7.0.5-py3-none-any.whl", hash = "sha256:46bc8ebefbe485407621d0a4264b23c080cedd913921bad7ac3ed2f26c183114", size = 13918, upload-time = "2026-03-09T20:51:27.33Z" },-]-[[package]]name = "certifi"version = "2026.4.22"@@ -725,7 +716,7 @@ wheels = [[[package]]name = "cyberdrop-dl-patched"-version = "9.9.0"+version = "9.9.1.dev0"source = { editable = "." }dependencies = [{ name = "aiodns", marker = "sys_platform != 'android' and sys_platform != 'win32'" },@@ -774,7 +765,6 @@ dev = [{ name = "pytest-asyncio" },{ name = "pytest-cov" },{ name = "ruff" },- { name = "tox" },][package.metadata]@@ -822,7 +812,6 @@ dev = [{ name = "pytest-asyncio", specifier = ">=1.3.0" },{ name = "pytest-cov", specifier = ">=7.1.0" },{ name = "ruff", specifier = "==0.15.6" },- { name = "tox", specifier = ">=4.53.0" },][[package]]@@ -840,15 +829,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/23/18/4cedda786e7da429e7489549a9e5461530d4133130e541f25fb94f015776/cyclopts-4.11.2-py3-none-any.whl", hash = "sha256:838020120b939549ff7c8423aca29c86764b5dd1d8a5d7f3753a6327861f537b", size = 213537, upload-time = "2026-05-04T00:11:56.103Z" },]-[[package]]-name = "distlib"-version = "0.4.0"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/96/8e/709914eb2b5749865801041647dc7f4e6d00b549cfe88b65ca192995f07c/distlib-0.4.0.tar.gz", hash = "sha256:feec40075be03a04501a973d81f633735b4b69f98b05450592310c0f401a4e0d", size = 614605, upload-time = "2025-07-17T16:52:00.465Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/33/6b/e0547afaf41bf2c42e52430072fa5658766e3d65bd4b03a563d1b6336f57/distlib-0.4.0-py2.py3-none-any.whl", hash = "sha256:9659f7d87e46584a30b5780e43ac7a2143098441670ff0a49d5f9034c54a6c16", size = 469047, upload-time = "2025-07-17T16:51:58.613Z" },-]-[[package]]name = "docstring-parser"version = "0.17.0"@@ -880,15 +860,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/a6/b5/f566c215c58d7d2b8d39104b6cda00f31a18bb480486cb7f0d68de6131f9/editor-1.7.0-py3-none-any.whl", hash = "sha256:8b1ad5e99846b076b96b18f7bc39ae21952c8e20d375c3f8f98fd02cacf19367", size = 3383, upload-time = "2026-02-03T13:51:29.075Z" },]-[[package]]-name = "filelock"-version = "3.25.2"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/94/b8/00651a0f559862f3bb7d6f7477b192afe3f583cc5e26403b44e59a55ab34/filelock-3.25.2.tar.gz", hash = "sha256:b64ece2b38f4ca29dd3e810287aa8c48182bbecd1ae6e9ae126c9b35f1382694", size = 40480, upload-time = "2026-03-11T20:45:38.487Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/a4/a5/842ae8f0c08b61d6484b52f99a03510a3a72d23141942d216ebe81fefbce/filelock-3.25.2-py3-none-any.whl", hash = "sha256:ca8afb0da15f229774c9ad1b455ed96e85a81373065fb10446672f64444ddf70", size = 26759, upload-time = "2026-03-11T20:45:37.437Z" },-]-[[package]]name = "frozenlist"version = "1.8.0"@@ -1243,15 +1214,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/b7/b9/c538f279a4e237a006a2c98387d081e9eb060d203d8ed34467cc0f0b9b53/packaging-26.0-py3-none-any.whl", hash = "sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529", size = 74366, upload-time = "2026-01-21T20:50:37.788Z" },]-[[package]]-name = "platformdirs"-version = "4.9.4"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/19/56/8d4c30c8a1d07013911a8fdbd8f89440ef9f08d07a1b50ab8ca8be5a20f9/platformdirs-4.9.4.tar.gz", hash = "sha256:1ec356301b7dc906d83f371c8f487070e99d3ccf9e501686456394622a01a934", size = 28737, upload-time = "2026-03-05T18:34:13.271Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/63/d7/97f7e3a6abb67d8080dd406fd4df842c2be0efaf712d1c899c32a075027c/platformdirs-4.9.4-py3-none-any.whl", hash = "sha256:68a9a4619a666ea6439f2ff250c12a853cd1cbd5158d258bd824a7df6be2f868", size = 21216, upload-time = "2026-03-05T18:34:12.172Z" },-]-[[package]]name = "pluggy"version = "1.6.0"@@ -1650,18 +1612,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" },]-[[package]]-name = "pyproject-api"-version = "1.10.0"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "packaging" },-]-sdist = { url = "https://files.pythonhosted.org/packages/45/7b/c0e1333b61d41c69e59e5366e727b18c4992688caf0de1be10b3e5265f6b/pyproject_api-1.10.0.tar.gz", hash = "sha256:40c6f2d82eebdc4afee61c773ed208c04c19db4c4a60d97f8d7be3ebc0bbb330", size = 22785, upload-time = "2025-10-09T19:12:27.21Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/54/cc/cecf97be298bee2b2a37dd360618c819a2a7fd95251d8e480c1f0eb88f3b/pyproject_api-1.10.0-py3-none-any.whl", hash = "sha256:8757c41a79c0f4ab71b99abed52b97ecf66bd20b04fa59da43b5840bac105a09", size = 13218, upload-time = "2025-10-09T19:12:24.428Z" },-]-[[package]]name = "pytest"version = "9.0.3"@@ -1705,19 +1655,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/9d/7a/d968e294073affff457b041c2be9868a40c1c71f4a35fcc1e45e5493067b/pytest_cov-7.1.0-py3-none-any.whl", hash = "sha256:a0461110b7865f9a271aa1b51e516c9a95de9d696734a2f71e3e78f46e1d4678", size = 22876, upload-time = "2026-03-21T20:11:14.438Z" },]-[[package]]-name = "python-discovery"-version = "1.2.2"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "filelock" },- { name = "platformdirs" },-]-sdist = { url = "https://files.pythonhosted.org/packages/de/ef/3bae0e537cfe91e8431efcba4434463d2c5a65f5a89edd47c6cf2f03c55f/python_discovery-1.2.2.tar.gz", hash = "sha256:876e9c57139eb757cb5878cbdd9ae5379e5d96266c99ef731119e04fffe533bb", size = 58872, upload-time = "2026-04-07T17:28:49.249Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/d8/db/795879cc3ddfe338599bddea6388cc5100b088db0a4caf6e6c1af1c27e04/python_discovery-1.2.2-py3-none-any.whl", hash = "sha256:e1ae95d9af875e78f15e19aed0c6137ab1bb49c200f21f5061786490c9585c7a", size = 31894, upload-time = "2026-04-07T17:28:48.09Z" },-]-[[package]]name = "pywin32"version = "311"@@ -1964,36 +1901,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/23/d1/136eb2cb77520a31e1f64cbae9d33ec6df0d78bdf4160398e86eec8a8754/tomli-2.4.0-py3-none-any.whl", hash = "sha256:1f776e7d669ebceb01dee46484485f43a4048746235e683bcdffacdf1fb4785a", size = 14477, upload-time = "2026-01-11T11:22:37.446Z" },]-[[package]]-name = "tomli-w"-version = "1.2.0"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/19/75/241269d1da26b624c0d5e110e8149093c759b7a286138f4efd61a60e75fe/tomli_w-1.2.0.tar.gz", hash = "sha256:2dd14fac5a47c27be9cd4c976af5a12d87fb1f0b4512f81d69cce3b35ae25021", size = 7184, upload-time = "2025-01-15T12:07:24.262Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/c7/18/c86eb8e0202e32dd3df50d43d7ff9854f8e0603945ff398974c1d91ac1ef/tomli_w-1.2.0-py3-none-any.whl", hash = "sha256:188306098d013b691fcadc011abd66727d3c414c571bb01b1a174ba8c983cf90", size = 6675, upload-time = "2025-01-15T12:07:22.074Z" },-]--[[package]]-name = "tox"-version = "4.53.0"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "cachetools" },- { name = "colorama" },- { name = "filelock" },- { name = "packaging" },- { name = "platformdirs" },- { name = "pluggy" },- { name = "pyproject-api" },- { name = "python-discovery" },- { name = "tomli-w" },- { name = "virtualenv" },-]-sdist = { url = "https://files.pythonhosted.org/packages/04/01/d87a00063fa670ce4c48a9706b615a95ddf2c9ef5558d43af6071f166fd4/tox-4.53.0.tar.gz", hash = "sha256:62c780e42f87d34ee60f2ea20342156253794fdcbd6885fd797d98ee05009f22", size = 274048, upload-time = "2026-04-14T13:44:13.782Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/16/03/02e2a03f3756cfb66e7e1bac41b06953f12cec75ddb961d56695d4d43dc4/tox-4.53.0-py3-none-any.whl", hash = "sha256:cc4e716d18c4889aa179d785175c438fa60c35deef20ce689ec288d8fb656096", size = 212164, upload-time = "2026-04-14T13:44:11.997Z" },-]-[[package]]name = "truststore"version = "0.10.4"@@ -2042,21 +1949,6 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" },]-[[package]]-name = "virtualenv"-version = "21.2.0"-source = { registry = "https://pypi.org/simple" }-dependencies = [- { name = "distlib" },- { name = "filelock" },- { name = "platformdirs" },- { name = "python-discovery" },-]-sdist = { url = "https://files.pythonhosted.org/packages/aa/92/58199fe10049f9703c2666e809c4f686c54ef0a68b0f6afccf518c0b1eb9/virtualenv-21.2.0.tar.gz", hash = "sha256:1720dc3a62ef5b443092e3f499228599045d7fea4c79199770499df8becf9098", size = 5840618, upload-time = "2026-03-09T17:24:38.013Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/c6/59/7d02447a55b2e55755011a647479041bc92a82e143f96a8195cb33bd0a1c/virtualenv-21.2.0-py3-none-any.whl", hash = "sha256:1bd755b504931164a5a496d217c014d098426cddc79363ad66ac78125f9d908f", size = 5825084, upload-time = "2026-03-09T17:24:35.378Z" },-]-[[package]]name = "wcwidth"version = "0.6.0"