github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[config] add 'conf' argument to 'config.load()' (#8084)

Browse Source 
to allow using an alternative config dict
This commit is contained in:
djsigmann
2025-08-21 18:23:35 +02:00
committed by GitHub
parent 1fc20d3fdd
commit 04fa29fa5a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/config.py
View File

@@ -185,13 +185,13 @@ def remap_categories():
opts[new] = opts[old]
def load(files=None, strict=False, loads=util.json_loads):
def load(files=None, strict=False, loads=util.json_loads, conf=_config):
"""Load JSON configuration files"""
for pathfmt in files or _default_configs:
path = util.expand_path(pathfmt)
try:
with open(path, encoding="utf-8") as fp:
conf = loads(fp.read())
config = loads(fp.read())
except OSError as exc:
if strict:
log.error(exc)
@@ -202,17 +202,17 @@ def load(files=None, strict=False, loads=util.json_loads):
if strict:
raise SystemExit(2)
else:
if not _config:
_config.update(conf)
if not conf:
conf.update(config)
else:
util.combine_dict(_config, conf)
util.combine_dict(conf, config)
_files.append(pathfmt)
if "subconfigs" in conf:
if subconfigs := conf["subconfigs"]:
if "subconfigs" in config:
if subconfigs := config["subconfigs"]:
if isinstance(subconfigs, str):
subconfigs = (subconfigs,)
load(subconfigs, strict, loads)
load(subconfigs, strict, loads, conf)
def clear():