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

[job] apply 'keywords-eval' to 'keywords-global' values (#6582)

Browse Source 
https://github.com/mikf/gallery-dl/issues/6582#issuecomment-3527246051
This commit is contained in:
Mike Fährmann
2025-11-13 20:29:31 +01:00
parent e840e3c680
commit 5cda64c8d8
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gallery_dl/job.py
View File

@@ -87,19 +87,22 @@ class Job():
"current_git_head": util.git_head()
}
# user-supplied metadata
if kwdict := extr.config("keywords-global"):
kwdict = extr.config("keywords")
if kwdict_global := extr.config("keywords-global"):
kwdict = {**kwdict_global, **kwdict} if kwdict else kwdict_global
elif not kwdict:
return
if extr.config("keywords-eval"):
self.kwdict_eval = []
for key, value in kwdict.items():
if isinstance(value, str):
fmt = formatter.parse(value, None, util.identity)
self.kwdict_eval.append((key, fmt.format_map))
else:
self.kwdict[key] = value
else:
self.kwdict.update(kwdict)
if kwdict := extr.config("keywords"):
if extr.config("keywords-eval"):
self.kwdict_eval = []
for key, value in kwdict.items():
if isinstance(value, str):
fmt = formatter.parse(value, None, util.identity)
self.kwdict_eval.append((key, fmt.format_map))
else:
self.kwdict[key] = value
else:
self.kwdict.update(kwdict)
def _build_config_path(self, parent):
extr = self.extractor