Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-23 03:02:50 +01:00
Code Issues Releases Wiki Activity

use '_extractor' info in UrlJobs

Browse Source
This commit is contained in:
Mike Fährmann 2021-05-19 15:52:30 +02:00
parent 4fc9668922
commit adf4d661b3
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gallery_dl/job.py
View File

@ -597,10 +597,16 @@ class UrlJob(Job):
for url in kwdict["_fallback"]:
print("|", url)
def handle_queue(self, url, _):
try:
UrlJob(url, self, self.depth + 1).run()
except exception.NoExtractorError:
def handle_queue(self, url, kwdict):
cls = kwdict.get("_extractor")
if cls:
extr = cls.from_url(url)
else:
extr = extractor.find(url)
if extr:
self.status |= self.__class__(extr, self).run()
else:
self._write_unsupported(url)

13
test/test_job.py
View File

@ -104,11 +104,14 @@ test:child
test:child
""")
# def test_child(self):
# extr = TestExtractorParent.from_url("test:parent")
# tjob = job.UrlJob(extr, depth=0)
# self.assertEqual(self._capture_stdout(tjob), """\
# """)
def test_child(self):
extr = TestExtractorParent.from_url("test:parent")
tjob = job.UrlJob(extr, depth=0)
self.assertEqual(self._capture_stdout(tjob), 3 * """\
https://example.org/1.jpg
https://example.org/2.jpg
https://example.org/3.jpg
""")
class TestInfoJob(TestJob):