Skip to content

Bulk asynchronous downloader for multiple file hosts

refactor: apply default parameter to root config model

NTFSvolume39692c14a863
diff --git a/cyberdrop_dl/cli.py b/cyberdrop_dl/cli.py
index 8dcb4ece9..ac25b17cc 100644
--- a/cyberdrop_dl/cli.py
+++ b/cyberdrop_dl/cli.py
@@ -16,13 +16,14 @@ from cyberdrop_dl.commands.hash import compute_hashes
from cyberdrop_dl.commands.retry import app as retry_app
from cyberdrop_dl.commands.retry import create_retry_source
from cyberdrop_dl.commands.scrape import download, prepare_manager, scrape
+from cyberdrop_dl.constants import DEFAULT_PARAMETER
from cyberdrop_dl.scrape_source import RetryScrapeSource, RetrySource
app = App(
name="cyberdrop-dl",
help="Bulk asynchronous downloader for multiple file hosts",
version=__version__,
- default_parameter=Parameter(negative_iterable=[], json_dict=False, json_list=False),
+ default_parameter=DEFAULT_PARAMETER,
result_action="return_value",
help_formatter=DefaultFormatter().with_newline_metadata(), # pyright: ignore[reportUnknownMemberType]
)
diff --git a/cyberdrop_dl/commands/scrape.py b/cyberdrop_dl/commands/scrape.py
index 3d532fa5c..947fd0ac0 100644
--- a/cyberdrop_dl/commands/scrape.py
+++ b/cyberdrop_dl/commands/scrape.py
@@ -117,6 +117,8 @@ def download(
group=_inputs_group,
help="URL(s) to download",
show_default=False,
+ consume_multiple=True,
+ allow_repeating=False,
),
] = (),
/,
diff --git a/cyberdrop_dl/constants.py b/cyberdrop_dl/constants.py
index 5de67803c..c03b89751 100644
--- a/cyberdrop_dl/constants.py
+++ b/cyberdrop_dl/constants.py
@@ -5,6 +5,7 @@ from contextvars import ContextVar
from enum import StrEnum, auto
from typing import TYPE_CHECKING, final
+from cyclopts import Parameter
from typing_extensions import Sentinel
from cyberdrop_dl import __version__, env
@@ -21,6 +22,14 @@ MISSING = Sentinel("MISSING")
MAIN_LOG_FILE: ContextVar[Path] = ContextVar("MAIN_LOG_FILE")
+DEFAULT_PARAMETER = Parameter(
+ negative_iterable=[],
+ json_dict=False,
+ json_list=False,
+ consume_multiple=True,
+ allow_repeating=False,
+)
+
class CIStrEnum(StrEnum):
@classmethod
diff --git a/cyberdrop_dl/models/__init__.py b/cyberdrop_dl/models/__init__.py
index 894958f40..e8f41d8c5 100644
--- a/cyberdrop_dl/models/__init__.py
+++ b/cyberdrop_dl/models/__init__.py
@@ -6,6 +6,7 @@ from cyclopts import Parameter
from pydantic import AnyUrl, BaseModel, Secret, SerializationInfo, TypeAdapter, model_serializer, model_validator
from cyberdrop_dl import env
+from cyberdrop_dl.constants import DEFAULT_PARAMETER
from cyberdrop_dl.utils import fast_cache
@@ -22,6 +23,7 @@ class DeferredModel(
): ...
+@DEFAULT_PARAMETER
class ConfigModel(DeferredModel, extra="forbid"): ...