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

update default config file paths

Browse Source
This commit is contained in:
Mike Fährmann
2016-11-10 16:24:08 +01:00
parent d2486366e0
commit 7c8fae62f6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gallery_dl/config.py
View File

@@ -20,7 +20,7 @@ def load(*files, strict=False):
configfiles = files or _default_configs
for conf in configfiles:
try:
path = os.path.expanduser(conf)
path = os.path.expanduser(os.path.expandvars(conf))
with open(path) as file:
confdict = json.load(file)
_config.update(confdict)
@@ -90,12 +90,14 @@ _config = {}
if os.name == "nt":
_default_configs = [
r"~\.config\gallery-dl\config.json",
r"%USERPROFILE%\gallery-dl\config.json",
r"~\.gallery-dl.conf",
r"%USERPROFILE%\gallery-dl.conf",
]
else:
_default_configs = [
"/etc/gallery-dl.conf",
"~/.config/gallery/config.json",
"~/.config/gallery-dl/config.json",
"~/.gallery-dl.conf",
"${HOME}/.config/gallery/config.json",
"${HOME}/.config/gallery-dl/config.json",
"${HOME}/.gallery-dl.conf",
]