Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: update default paths
NTFSvolumec42d178b7822
diff --git a/cyberdrop_dl/config/__init__.py b/cyberdrop_dl/config/__init__.pyindex b5104f2b5..4cf39e932 100644--- a/cyberdrop_dl/config/__init__.py+++ b/cyberdrop_dl/config/__init__.py@@ -10,7 +10,6 @@ from cyclopts.bind import normalize_tokensfrom pydantic import AfterValidator, BaseModel, Field, NonNegativeInt, PositiveIntfrom cyberdrop_dl.config.appdata import AppData-from cyberdrop_dl.constants import DEFAULT_DOWNLOAD_PATHfrom cyberdrop_dl.exceptions import CDLConfigRuntimeErrorsGroup, InvalidYamlErrorfrom cyberdrop_dl.models import ConfigModelfrom cyberdrop_dl.models.types import ByteSizeSerilized, FalsyAsTuple # noqa: TC001@@ -63,7 +62,7 @@ class Config(ConfigModel, title="cyberdrop-dl config"):delete_partial_files: bool = False"Delete partial files after a run"- download_folder: Annotated[Path, Parameter(alias=("--output", "-o", "-d"))] = DEFAULT_DOWNLOAD_PATH+ download_folder: Annotated[Path, Parameter(alias=("--output", "-o", "-d"))] = Path("downloads/cyberdrop-dl")"Base output path for all downloads"downloads: Downloads = Field(default_factory=Downloads)diff --git a/cyberdrop_dl/config/default.yaml b/cyberdrop_dl/config/default.yamlindex eef55375e..189a534d2 100644--- a/cyberdrop_dl/config/default.yaml+++ b/cyberdrop_dl/config/default.yaml@@ -34,7 +34,7 @@ crawlers:deep_scrape: falsedelete_empty_folders: truedelete_partial_files: false-download_folder: Downloads+download_folder: downloads/cyberdrop-dldownloads:attempts: 2concurrency: 15@@ -97,10 +97,10 @@ logs:console_level: nullexpire_after: nullfiles:- download_errors: Download_Error_URLs.csv+ download_errors: download_errors.csvmain: downloader.log- scrape_errors: Scrape_Error_URLs.csv- unsupported: Unsupported_URLs.csv+ scrape_errors: scrape_errors.csv+ unsupported: unsupported.csvfolder: nulllevel: DEBUGrotate: false@@ -134,7 +134,7 @@ sort:non_media: '{sort_dir}/{base_dir}/Other/{filename}{ext}'video: '{sort_dir}/{base_dir}/Videos/{filename}{ext}'input_folder: null- output_folder: Downloads/Cyberdrop-DL Sorted Downloads+ output_folder: downloads/cyberdrop-dl sortedsubfolders:create: trueinclude:diff --git a/cyberdrop_dl/config/schema.json b/cyberdrop_dl/config/schema.jsonindex 0a7fd3c32..3703710ca 100644--- a/cyberdrop_dl/config/schema.json+++ b/cyberdrop_dl/config/schema.json@@ -564,15 +564,15 @@},"download_errors": {"$ref": "#/$defs/CSVPath",- "default": "Download_Error_URLs.csv"+ "default": "download_errors.csv"},"scrape_errors": {"$ref": "#/$defs/CSVPath",- "default": "Scrape_Error_URLs.csv"+ "default": "scrape_errors.csv"},"unsupported": {"$ref": "#/$defs/CSVPath",- "default": "Unsupported_URLs.csv"+ "default": "unsupported.csv"}},"title": "LogFiles",@@ -710,7 +710,7 @@"default": null},"output_folder": {- "default": "Downloads/Cyberdrop-DL Sorted Downloads",+ "default": "downloads/cyberdrop-dl sorted","format": "path","title": "Output Folder","type": "string"@@ -971,7 +971,7 @@"type": "boolean"},"download_folder": {- "default": "Downloads",+ "default": "downloads/cyberdrop-dl","format": "path","title": "Download Folder","type": "string"diff --git a/cyberdrop_dl/config/settings.py b/cyberdrop_dl/config/settings.pyindex e46dd3058..88706651b 100644--- a/cyberdrop_dl/config/settings.py+++ b/cyberdrop_dl/config/settings.py@@ -9,13 +9,7 @@ from cyclopts import Parameterfrom pydantic import BaseModel, Field, PrivateAttrfrom pydantic.types import ByteSize, NonNegativeFloat, PositiveFloat, PositiveInt-from cyberdrop_dl.constants import (- DEFAULT_DOWNLOAD_PATH,- LOGS_DATE_FORMAT,- LOGS_DATETIME_FORMAT,- CIStrEnum,- HashMode,-)+from cyberdrop_dl.constants import LOGS_DATE_FORMAT, LOGS_DATETIME_FORMAT, CIStrEnum, HashModefrom cyberdrop_dl.models import ConfigGroup, ConfigModelfrom cyberdrop_dl.models.types import (ByteSizeSerilized,@@ -56,13 +50,13 @@ class LogFiles(ConfigModel):main: Annotated[LogPath, Parameter(alias="--log-file")] = Path("downloader.log")"Path of main log file"- download_errors: CSVPath = Path("Download_Error_URLs.csv")+ download_errors: CSVPath = Path("download_errors.csv")"Save download errors to this file (MUST BE .csv)"- scrape_errors: CSVPath = Path("Scrape_Error_URLs.csv")+ scrape_errors: CSVPath = Path("scrape_errors.csv")"Save scrape errors to this file (MUST BE .csv)"- unsupported: CSVPath = Path("Unsupported_URLs.csv")+ unsupported: CSVPath = Path("unsupported.csv")"Save unsupported URLs to this file (MUST BE .csv)"@property@@ -216,7 +210,7 @@ class Sort(ConfigGroup, name=None):input_folder: FalsyAsNone[Path] = None"Base folder to scan for files. Default to the same value as `--download-folder`"- output_folder: Path = DEFAULT_DOWNLOAD_PATH / "Cyberdrop-DL Sorted Downloads"+ output_folder: Path = Path("downloads/cyberdrop-dl sorted")"Output path to place sorted files in"formats: SortFormats = Field(default_factory=SortFormats)diff --git a/cyberdrop_dl/constants.py b/cyberdrop_dl/constants.pyindex 993715593..c75492768 100644--- a/cyberdrop_dl/constants.py+++ b/cyberdrop_dl/constants.py@@ -3,13 +3,15 @@ from __future__ import annotationsimport datetimefrom contextvars import ContextVarfrom enum import Enum, StrEnum, auto-from pathlib import Path-from typing import final+from typing import TYPE_CHECKING, finalfrom rich.text import Textfrom cyberdrop_dl import __version__, env+if TYPE_CHECKING:+ from pathlib import Path+STARTUP_TIME_UTC = datetime.datetime.now(datetime.UTC)LOGS_DATETIME_FORMAT = "%Y%m%d_%H%M%S"LOGS_DATE_FORMAT = "%Y_%m_%d"@@ -59,9 +61,6 @@ class BlockedDomains:exact_match = *exact_match, "x.com"-DEFAULT_DOWNLOAD_PATH = Path("./Downloads")--class HashType(StrEnum):md5 = "md5"sha256 = "sha256"