mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-22 18:53:21 +01:00
add loaded config files to debug output
This commit is contained in:
parent
4c6379e9d5
commit
46d811bac0
@ -138,6 +138,8 @@ def main():
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
log.debug("Configuration Files %s", config._files)
|
||||
|
||||
if args.list_modules:
|
||||
extractor.modules.append("")
|
||||
sys.stdout.write("\n".join(extractor.modules))
|
||||
|
@ -21,6 +21,7 @@ log = logging.getLogger("config")
|
||||
# internals
|
||||
|
||||
_config = {}
|
||||
_files = []
|
||||
|
||||
if util.WINDOWS:
|
||||
_default_configs = [
|
||||
@ -61,8 +62,8 @@ def load(files=None, strict=False, fmt="json"):
|
||||
else:
|
||||
parsefunc = json.load
|
||||
|
||||
for path in files or _default_configs:
|
||||
path = util.expand_path(path)
|
||||
for pathfmt in files or _default_configs:
|
||||
path = util.expand_path(pathfmt)
|
||||
try:
|
||||
with open(path, encoding="utf-8") as file:
|
||||
confdict = parsefunc(file)
|
||||
@ -79,6 +80,7 @@ def load(files=None, strict=False, fmt="json"):
|
||||
_config.update(confdict)
|
||||
else:
|
||||
util.combine_dict(_config, confdict)
|
||||
_files.append(pathfmt)
|
||||
|
||||
|
||||
def clear():
|
||||
|
Loading…
Reference in New Issue
Block a user