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

[job] improve 'metadata_url' handling

Browse Source
This commit is contained in:
Mike Fährmann
2026-02-07 18:24:27 +01:00
parent 2d64e76223
commit b174bb412a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gallery_dl/job.py
View File

@@ -210,6 +210,7 @@ class Job():
"""Call the appropriate message handler""" """Call the appropriate message handler"""
msg = None msg = None
process = True process = True
metadata_url = self.metadata_url
if follow := self.extractor.config("follow"): if follow := self.extractor.config("follow"):
follow = formatter.parse(follow, None, util.identity).format_map follow = formatter.parse(follow, None, util.identity).format_map
@@ -222,8 +223,8 @@ class Job():
if msg == Message.Directory: if msg == Message.Directory:
if follow_urls is not None: if follow_urls is not None:
for furl in follow_urls: for furl in follow_urls:
if self.metadata_url: if metadata_url is not None:
follow_kwdict[self.metadata_url] = furl follow_kwdict[metadata_url] = furl
if self.pred_queue(furl, follow_kwdict): if self.pred_queue(furl, follow_kwdict):
self.handle_queue(furl, follow_kwdict) self.handle_queue(furl, follow_kwdict)
follow_urls = None follow_urls = None
@@ -248,8 +249,8 @@ class Job():
continue continue
elif msg == Message.Url: elif msg == Message.Url:
if self.metadata_url: if metadata_url is not None:
kwdict[self.metadata_url] = url kwdict[metadata_url] = url
self.update_kwdict(kwdict) self.update_kwdict(kwdict)
if self.pred_url(url, kwdict): if self.pred_url(url, kwdict):
if FLAGS.FILE is False: if FLAGS.FILE is False:
@@ -261,8 +262,8 @@ class Job():
elif msg == Message.Queue: elif msg == Message.Queue:
self.update_kwdict(kwdict) self.update_kwdict(kwdict)
if self.metadata_url: if metadata_url is not None:
kwdict[self.metadata_url] = url kwdict[metadata_url] = url
if self.pred_queue(url, kwdict): if self.pred_queue(url, kwdict):
if FLAGS.CHILD is False: if FLAGS.CHILD is False:
FLAGS.CHILD = None FLAGS.CHILD = None
@@ -273,8 +274,8 @@ class Job():
if follow_urls is not None: if follow_urls is not None:
for furl in follow_urls: for furl in follow_urls:
if self.metadata_url: if metadata_url is not None:
follow_kwdict[self.metadata_url] = furl follow_kwdict[metadata_url] = furl
if self.pred_queue(furl, follow_kwdict): if self.pred_queue(furl, follow_kwdict):
self.handle_queue(furl, follow_kwdict) self.handle_queue(furl, follow_kwdict)