Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 18:53:21 +01:00
Code Issues Releases Wiki Activity

improve output of '-K' for parent extractors 2 (#825)

Browse Source 
This is what bb882b8 was supposed to be, but I managed to
not include those changes in the first commit …
This commit is contained in:
Mike Fährmann 2020-06-18 15:04:15 +02:00
parent dc16f73965
commit 7e8a747c56
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gallery_dl/job.py
View File

@ -454,15 +454,18 @@ class KeywordJob(Job):
self.print_kwdict(kwdict)
def handle_queue(self, url, kwdict):
extr = None
if "_extractor" in kwdict:
extr = kwdict["_extractor"].from_url(url)
if not util.filter_dict(kwdict):
self.extractor.log.info(
"This extractor only spawns other extractors "
"and does not provide any metadata on its own.")
if "_extractor" in kwdict:
if extr:
self.extractor.log.info(
"Showing results for '%s' instead:\n", url)
extr = kwdict["_extractor"].from_url(url)
KeywordJob(extr, self).run()
else:
self.extractor.log.info(
@ -471,9 +474,9 @@ class KeywordJob(Job):
print("Keywords for --chapter-filter:")
print("------------------------------")
self.print_kwdict(kwdict)
if self.extractor.categorytransfer:
if extr or self.extractor.categorytransfer:
print()
KeywordJob(url, self).run()
KeywordJob(extr or url, self).run()
raise exception.StopExtraction()
@staticmethod