Bulk asynchronous downloader for multiple file hosts
Python asynciobunkrcyberdropdownloaderdropboxfilestergofilegoogle-drivemediafiremegamega-nzonedrivepatreonpawchivepinterestpixeldraintransfer-ittwitchtwittervk
refactor: move merge logic to models
NTFSvolume13dd0afd7b2e
diff --git a/cyberdrop_dl/cli/download.py b/cyberdrop_dl/cli/download.pyindex 9c34cb0e2..213bd9c03 100644--- a/cyberdrop_dl/cli/download.py+++ b/cyberdrop_dl/cli/download.py@@ -127,7 +127,7 @@ def download(config = config or Config()appdata = AppData.from_path(cli.appdata_folder) if cli.appdata_folder else AppData.default()- config = Config.from_file(cli.config_file or appdata.config_file).update(config)+ config = Config.from_file(cli.config_file or appdata.config_file) | configif not config.ui.mode.is_fullscreen or cli.config_file or config.sort.enabled:cli.download = Truediff --git a/cyberdrop_dl/config/__init__.py b/cyberdrop_dl/config/__init__.pyindex b391012a0..841f5f094 100644--- a/cyberdrop_dl/config/__init__.py+++ b/cyberdrop_dl/config/__init__.py@@ -9,9 +9,9 @@ from cyclopts.bind import normalize_tokensfrom pydantic import BaseModel, ByteSize, Field, NonNegativeInt, PositiveInt, field_validatorfrom cyberdrop_dl import yaml-from cyberdrop_dl.config.merge import merge_modelsfrom cyberdrop_dl.constants import DEFAULT_DOWNLOAD_STORAGEfrom cyberdrop_dl.exceptions import CDLConfigRuntimeErrorsGroup+from cyberdrop_dl.models import merge_modelsfrom cyberdrop_dl.models.types import ByteSizeSerilized, ListNonNegativeInt # noqa: TC001from cyberdrop_dl.models.validators import to_bytesizefrom cyberdrop_dl.utils import cleanup@@ -90,7 +90,7 @@ class Config(BaseModel):def from_file(cls, config_file: Path) -> Config:return _load_config_file(config_file)- def update(self, other: Self) -> Self:+ def __or__(self, other: Self) -> Self:return merge_models(self, other)@staticmethod@@ -149,6 +149,19 @@ def _load_config_file(file: Path, *, save_if_not_found: bool = False) -> Config:return config+def add_or_remove_lists(cli_values: list[str], config_values: list[str]) -> None:+ match cli_values:+ case ["+", *_]:+ new_values = set(config_values + cli_values)+ case ["-", *_]:+ new_values = set(config_values) - set(cli_values)+ case _:+ return++ cli_values.clear()+ cli_values.extend(sorted(new_values - {"+", "-"}))++def _coerce(*, config: Config | None = None) -> Config:if config is None:return Config()diff --git a/cyberdrop_dl/config/merge.py b/cyberdrop_dl/config/merge.pydeleted file mode 100644index 7de47a902..000000000--- a/cyberdrop_dl/config/merge.py+++ /dev/null@@ -1,38 +0,0 @@-from typing import Any--from pydantic import BaseModel---def add_or_remove_lists(cli_values: list[str], config_values: list[str]) -> None:- exclude = {"+", "-"}- if cli_values:- if cli_values[0] == "+":- new_values_set = set(config_values + cli_values)- cli_values.clear()- cli_values.extend(sorted(new_values_set - exclude))- elif cli_values[0] == "-":- new_values_set = set(config_values) - set(cli_values)- cli_values.clear()- cli_values.extend(sorted(new_values_set - exclude))---def merge_dicts(dict1: dict[str, Any], dict2: dict[str, Any]) -> dict[str, Any]:- for key, val in dict1.items():- if isinstance(val, dict):- if key in dict2 and isinstance(dict2[key], dict):- merge_dicts(val, dict2[key])- elif key in dict2:- dict1[key] = dict2[key]-- for key, val in dict2.items():- if key not in dict1:- dict1[key] = val-- return dict1---def merge_models[M: BaseModel](default: M, new: M) -> M:- default_dict = default.model_dump()- new_dict = new.model_dump(exclude_unset=True)- updated_dict = merge_dicts(default_dict, new_dict)- return default.model_validate(updated_dict)diff --git a/cyberdrop_dl/models/__init__.py b/cyberdrop_dl/models/__init__.pyindex 1a72e4cff..78da89a4d 100644--- a/cyberdrop_dl/models/__init__.py+++ b/cyberdrop_dl/models/__init__.py@@ -89,3 +89,25 @@ class AppriseURL(AliasModel):url: str = objreturn {"url": url, "tags": tags}+++def merge_dicts(dict1: dict[str, Any], dict2: dict[str, Any]) -> dict[str, Any]:+ for key, val in dict1.items():+ if isinstance(val, dict):+ if key in dict2 and isinstance(dict2[key], dict):+ merge_dicts(val, dict2[key])+ elif key in dict2:+ dict1[key] = dict2[key]++ for key, val in dict2.items():+ if key not in dict1:+ dict1[key] = val++ return dict1+++def merge_models[M: BaseModel](default: M, new: M) -> M:+ default_dict = default.model_dump()+ new_dict = new.model_dump(exclude_unset=True)+ updated_dict = merge_dicts(default_dict, new_dict)+ return default.model_validate(updated_dict)diff --git a/tests/test_config.py b/tests/test_config.pyindex 95d6d1df6..444a86fae 100644--- a/tests/test_config.py+++ b/tests/test_config.py@@ -9,8 +9,8 @@ from pydantic import BaseModelimport cyberdrop_dl.cli.downloadfrom cyberdrop_dl.config import Config, _resolve_paths, settings-from cyberdrop_dl.config.merge import merge_dictsfrom cyberdrop_dl.exceptions import CDLConfigRuntimeErrorsGroup+from cyberdrop_dl.models import merge_dictsdef test_config_equality() -> None: