Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-26 12:42:29 +01:00
Code Issues Releases Wiki Activity

add loaded config files to debug output

Browse Source
This commit is contained in:
Mike Fährmann 2022-11-18 17:15:32 +01:00
parent 4c6379e9d5
commit 46d811bac0
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/__init__.py
View File

@ -138,6 +138,8 @@ def main():
except AttributeError: except AttributeError:
pass pass
log.debug("Configuration Files %s", config._files)
if args.list_modules: if args.list_modules:
extractor.modules.append("") extractor.modules.append("")
sys.stdout.write("\n".join(extractor.modules)) sys.stdout.write("\n".join(extractor.modules))

6
gallery_dl/config.py
View File

@ -21,6 +21,7 @@ log = logging.getLogger("config")
# internals # internals
_config = {} _config = {}
_files = []
if util.WINDOWS: if util.WINDOWS:
_default_configs = [ _default_configs = [
@ -61,8 +62,8 @@ def load(files=None, strict=False, fmt="json"):
else: else:
parsefunc = json.load parsefunc = json.load
for path in files or _default_configs: for pathfmt in files or _default_configs:
path = util.expand_path(path) path = util.expand_path(pathfmt)
try: try:
with open(path, encoding="utf-8") as file: with open(path, encoding="utf-8") as file:
confdict = parsefunc(file) confdict = parsefunc(file)
@ -79,6 +80,7 @@ def load(files=None, strict=False, fmt="json"):
_config.update(confdict) _config.update(confdict)
else: else:
util.combine_dict(_config, confdict) util.combine_dict(_config, confdict)
_files.append(pathfmt)
def clear(): def clear():