Skip to content

Bulk asynchronous downloader for multiple file hosts

tests: add more config tests (#143)

NTFSvolume3bdbbc186ae5
diff --git a/.zed/settings.json b/.zed/settings.json
index b41052013..429575c86 100644
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -6,7 +6,7 @@
"Python": {
"show_whitespaces": "all",
"show_edit_predictions": true,
- "hard_tabs": true,
+ "hard_tabs": false,
"format_on_save": "on",
"formatter": {
"language_server": {
diff --git a/cyberdrop_dl/config/__init__.py b/cyberdrop_dl/config/__init__.py
index 11df5dc48..2ac8d8fe4 100755
--- a/cyberdrop_dl/config/__init__.py
+++ b/cyberdrop_dl/config/__init__.py
@@ -3,7 +3,8 @@ from __future__ import annotations
from pathlib import Path # noqa: TC003
from typing import TYPE_CHECKING, Self, TypeVar
-from cyclopts import Parameter
+from cyclopts import App, Parameter
+from cyclopts.bind import normalize_tokens
from pydantic import BaseModel, Field
from cyberdrop_dl import yaml
@@ -16,10 +17,14 @@ from .auth import AuthSettings
from .settings import ConfigSettings
if TYPE_CHECKING:
+ from collections.abc import Iterable
+
from cyberdrop_dl.managers.manager import AppData, Manager
_BaseModelT = TypeVar("_BaseModelT", bound=BaseModel)
+_APP: App | None = None
+
@Parameter(name="*")
class Config(BaseModel):
@@ -54,6 +59,16 @@ class Config(BaseModel):
def update(self, other: Self) -> Self:
return merge_models(self, other)
+ @classmethod
+ def parse_args(cls, tokens: str | Iterable[str]) -> Config:
+ global _APP
+ if _APP is None:
+ _APP = App(print_error=False, exit_on_error=False)
+ _ = _APP.command(name="coerce")(_coerce)
+ fn, bound, *_ = _APP.parse_args(["coerce", *normalize_tokens(tokens)])
+ assert fn is _coerce
+ return _coerce(*bound.args, **bound.kwargs)
+
def _load_config_file(file: Path, model: type[_BaseModelT]) -> _BaseModelT:
try:
@@ -66,4 +81,10 @@ def _load_config_file(file: Path, model: type[_BaseModelT]) -> _BaseModelT:
return model.model_validate(content)
+def _coerce(*, config: Config | None = None) -> Config:
+ if config is None:
+ return Config()
+ return config
+
+
__all__ = ["AuthSettings", "Config", "ConfigSettings", "GlobalSettings"]
diff --git a/cyberdrop_dl/config/settings.py b/cyberdrop_dl/config/settings.py
index e3bc19ea4..d326e1013 100755
--- a/cyberdrop_dl/config/settings.py
+++ b/cyberdrop_dl/config/settings.py
@@ -68,9 +68,11 @@ class DownloadOptions(SettingsGroup):
class Files(SettingsGroup):
- download_folder: Path = Field(default=DEFAULT_DOWNLOAD_STORAGE, validation_alias="d")
- dump_json: bool = Field(default=False, validation_alias="j")
- input_file: Path = Field(default=Path("URLs.txt"), validation_alias="i")
+ download_folder: Annotated[Path, Parameter(alias=("--output", "-o", "-d"))] = Field(
+ default=DEFAULT_DOWNLOAD_STORAGE, validation_alias="d"
+ )
+ dump_json: Annotated[bool, Parameter(alias="-j")] = Field(default=False, validation_alias="j")
+ input_file: Annotated[Path, Parameter(alias="-i")] = Field(default=Path("URLs.txt"), validation_alias="i")
save_pages_html: bool = False
@@ -127,6 +129,19 @@ class Logs(SettingsGroup):
_ = delete_empty_files_and_folders(self.log_folder)
+ def __eq__(self, other: object) -> bool:
+ # Exclude _created_at from compare (AKA __pydantic_private__)
+ if not isinstance(other, BaseModel):
+ return NotImplemented
+
+ self_type = self.__pydantic_generic_metadata__["origin"] or self.__class__
+ other_type = other.__pydantic_generic_metadata__["origin"] or other.__class__
+
+ if not (self_type == other_type and self.__pydantic_extra__ == other.__pydantic_extra__):
+ return False
+
+ return self.__dict__ == other.__dict__
+
class FileSizeLimits(SettingsGroup):
maximum_image_size: ByteSizeSerilized = ByteSize(0)
diff --git a/tests/test_config.py b/tests/test_config.py
index b57f8ab05..52fd538c0 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,8 +1,56 @@
from __future__ import annotations
+import time
+
+import pytest
+from cyclopts.exceptions import UnknownOptionError
+
+from cyberdrop_dl.config import Config, settings
from cyberdrop_dl.config.merge import merge_dicts
+def test_config_equality():
+ config1 = Config()
+ time.sleep(0.1)
+ config2 = Config()
+ assert config1.__dict__ == config2.__dict__
+ assert config1 == config2
+ assert config1.model_dump() == config2.model_dump()
+ config1.settings.resolve_paths()
+ config2.settings.resolve_paths()
+ assert config1 == config2
+ assert config1.model_dump() == config2.model_dump()
+
+
+def test_parse_config_from_args():
+ assert Config() == Config.parse_args([])
+
+
+def test_parse_config_from_args2():
+ config = Config.model_validate(
+ {
+ "settings": {
+ "files": {
+ "input_file": "test.txt",
+ }
+ }
+ }
+ )
+ assert config == Config.parse_args(["--input-file", "test.txt"])
+ assert config == Config.parse_args(["-i", "test.txt"])
+ with pytest.raises(UnknownOptionError):
+ _ = Config.parse_args(["--i", "test.txt"])
+
+
+def test_logs_equality():
+ logs1 = settings.Logs()
+ time.sleep(0.1)
+ logs2 = settings.Logs()
+ assert logs1._created_at != logs2._created_at
+ assert logs1.__dict__ == logs2.__dict__
+ assert logs1 == logs2
+
+
class TestMergeDicts:
def test_overwrite(self) -> None:
dict1 = {"a": 1, "b": 2}