From e9989ff7bd54822973a0a00ed00a5c7c07276778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 14 Feb 2026 16:13:46 +0100 Subject: [PATCH] [options] add '--config-json' command-line option --- docs/options.md | 4 +++- gallery_dl/__init__.py | 4 +++- gallery_dl/option.py | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/options.md b/docs/options.md index 86d9654e..2be7c5d3 100644 --- a/docs/options.md +++ b/docs/options.md @@ -138,7 +138,9 @@ ## Configuration Options: -o, --option KEY=VALUE Additional options. Example: -o browser=firefox - -c, --config FILE Additional configuration files in JSON format + -c, --config FILE Additional configuration files in default + format + --config-json FILE Additional configuration files in JSON format --config-yaml FILE Additional configuration files in YAML format --config-toml FILE Additional configuration files in TOML format --config-type TYPE Set filetype of default configuration files diff --git a/gallery_dl/__init__.py b/gallery_dl/__init__.py index b6a275ee..c51338c8 100644 --- a/gallery_dl/__init__.py +++ b/gallery_dl/__init__.py @@ -33,8 +33,10 @@ def main(): config.log.error(exc) if args.config_load: config.load() + if args.configs_extra: + config.load(args.configs_extra, strict=True) if args.configs_json: - config.load(args.configs_json, strict=True) + config.load(args.configs_json, strict=True, loads=util.json_loads) if args.configs_yaml: import yaml config.load(args.configs_yaml, strict=True, loads=yaml.safe_load) diff --git a/gallery_dl/option.py b/gallery_dl/option.py index 928d80b3..0abefb15 100644 --- a/gallery_dl/option.py +++ b/gallery_dl/option.py @@ -616,6 +616,11 @@ def build_parser(): ) configuration.add_argument( "-c", "--config", + dest="configs_extra", metavar="FILE", action="append", + help="Additional configuration files in default format", + ) + configuration.add_argument( + "--config-json", dest="configs_json", metavar="FILE", action="append", help="Additional configuration files in JSON format", )