Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: rename client modules (#1797)
NTFSvolume31d68bd7319b
diff --git a/cyberdrop_dl/clients/download_client.py b/cyberdrop_dl/clients/downloads.pysimilarity index 99%rename from cyberdrop_dl/clients/download_client.pyrename to cyberdrop_dl/clients/downloads.pyindex cc0e9b621..7d4c68897 100644--- a/cyberdrop_dl/clients/download_client.py+++ b/cyberdrop_dl/clients/downloads.py@@ -20,7 +20,7 @@ if TYPE_CHECKING:from pathlib import Pathfrom typing import Any- from cyberdrop_dl.clients.client import HTTPClient+ from cyberdrop_dl.clients.http import HTTPClientfrom cyberdrop_dl.clients.response import AbstractResponsefrom cyberdrop_dl.config import Configfrom cyberdrop_dl.manager import Managerdiff --git a/cyberdrop_dl/clients/client.py b/cyberdrop_dl/clients/http.pysimilarity index 100%rename from cyberdrop_dl/clients/client.pyrename to cyberdrop_dl/clients/http.pydiff --git a/cyberdrop_dl/crawlers/crawler.py b/cyberdrop_dl/crawlers/crawler.pyindex 07fa61c8e..13ff623f9 100644--- a/cyberdrop_dl/crawlers/crawler.py+++ b/cyberdrop_dl/crawlers/crawler.py@@ -21,7 +21,7 @@ from aiolimiter import AsyncLimiterfrom typing_extensions import deprecatedfrom cyberdrop_dl import env-from cyberdrop_dl.clients.client import HTTPClient, HTTPClientProxy+from cyberdrop_dl.clients.http import HTTPClient, HTTPClientProxyfrom cyberdrop_dl.crawlers._hls import HLSParserfrom cyberdrop_dl.downloader.http import Downloaderfrom cyberdrop_dl.exceptions import MaxChildrenError, NoExtensionError, ScrapeErrordiff --git a/cyberdrop_dl/downloader/http.py b/cyberdrop_dl/downloader/http.pyindex 820049531..8eea7658f 100644--- a/cyberdrop_dl/downloader/http.py+++ b/cyberdrop_dl/downloader/http.py@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, NamedTuplefrom aiohttp import ClientConnectorError, ClientError, ClientResponseErrorfrom cyberdrop_dl import aio, constants, ffmpeg, storage-from cyberdrop_dl.clients.download_client import filter_by_duration+from cyberdrop_dl.clients.downloads import filter_by_durationfrom cyberdrop_dl.exceptions import (DownloadError,DurationError,@@ -28,7 +28,7 @@ if TYPE_CHECKING:from collections.abc import AsyncGenerator, Generatorfrom pathlib import Path- from cyberdrop_dl.clients.download_client import DownloadClient+ from cyberdrop_dl.clients.downloads import DownloadClientfrom cyberdrop_dl.config import Configfrom cyberdrop_dl.manager import Managerfrom cyberdrop_dl.utils.m3u8 import M3U8, Renditiondiff --git a/cyberdrop_dl/downloader/mega_nz.py b/cyberdrop_dl/downloader/mega_nz.pyindex 058d7c7ca..6b57d32b6 100644--- a/cyberdrop_dl/downloader/mega_nz.py+++ b/cyberdrop_dl/downloader/mega_nz.py@@ -7,7 +7,7 @@ from mega.chunker import MegaChunker, get_chunksfrom typing_extensions import overridefrom cyberdrop_dl import aio, storage-from cyberdrop_dl.clients.download_client import DownloadClient, make_speed_checker+from cyberdrop_dl.clients.downloads import DownloadClient, make_speed_checkerfrom cyberdrop_dl.downloader.http import Downloaderif TYPE_CHECKING:diff --git a/cyberdrop_dl/manager.py b/cyberdrop_dl/manager.pyindex 5c58b8e38..9ed3e141b 100644--- a/cyberdrop_dl/manager.py+++ b/cyberdrop_dl/manager.py@@ -15,8 +15,8 @@ from pydantic.types import ByteSizefrom cyberdrop_dl import __version__, cookies, env, ffmpeg, stats, yamlfrom cyberdrop_dl.cli import CLIargs-from cyberdrop_dl.clients.client import HTTPClient-from cyberdrop_dl.clients.download_client import DownloadClient+from cyberdrop_dl.clients.downloads import DownloadClient+from cyberdrop_dl.clients.http import HTTPClientfrom cyberdrop_dl.config import Configfrom cyberdrop_dl.csv_logs import CSVLogsManagerfrom cyberdrop_dl.database import Databasediff --git a/pyproject.toml b/pyproject.tomlindex e410118e6..bf192c778 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -52,7 +52,7 @@ license-files = ["LICENSE"]maintainers = [{name = "NTFSvolume", email = "[email protected]"}]readme = "README.md"requires-python = ">=3.11"-version = "9.7.1.dev1"+version = "9.7.1.dev2"[project.optional-dependencies]apprise = [diff --git a/tests/test_client.py b/tests/test_client.pyindex a2b167f47..d5431b4c9 100644--- a/tests/test_client.py+++ b/tests/test_client.py@@ -4,7 +4,7 @@ import sysimport aiohttpimport pytest-from cyberdrop_dl.clients.client import HTTPClient+from cyberdrop_dl.clients.http import HTTPClientfrom cyberdrop_dl.exceptions import ScrapeErrorfrom cyberdrop_dl.manager import Managerdiff --git a/tests/test_download_client.py b/tests/test_download_client.pyindex 26262d171..be76ab561 100644--- a/tests/test_download_client.py+++ b/tests/test_download_client.py@@ -1,7 +1,7 @@import pytestfrom multidict import CIMultiDict-from cyberdrop_dl.clients.download_client import DownloadClient, _check_content_type, _get_content_type+from cyberdrop_dl.clients.downloads import DownloadClient, _check_content_type, _get_content_typefrom cyberdrop_dl.exceptions import InvalidContentTypeErrorfrom cyberdrop_dl.manager import Managerdiff --git a/tests/test_manager.py b/tests/test_manager.pyindex 28f14723f..79d84e231 100644--- a/tests/test_manager.py+++ b/tests/test_manager.py@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Any, TypeVarimport pytest-from cyberdrop_dl.clients.client import HTTPClient+from cyberdrop_dl.clients.http import HTTPClientfrom cyberdrop_dl.config import Configfrom cyberdrop_dl.database import Databasefrom cyberdrop_dl.dedupe import Czkawkadiff --git a/uv.lock b/uv.lockindex 6e88cab9b..cda4d954d 100644--- a/uv.lock+++ b/uv.lock@@ -725,7 +725,7 @@ wheels = [[[package]]name = "cyberdrop-dl-patched"-version = "9.7.1.dev1"+version = "9.7.1.dev2"source = { editable = "." }dependencies = [{ name = "aiodns", marker = "sys_platform != 'android' and sys_platform != 'win32'" },