From ae686c4c0881d92cf2989c2f7e53005f883c2a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Wed, 24 May 2017 15:15:06 +0200 Subject: [PATCH] run queue items immediately --- gallery_dl/job.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gallery_dl/job.py b/gallery_dl/job.py index 4769ee24..2748c7c5 100644 --- a/gallery_dl/job.py +++ b/gallery_dl/job.py @@ -118,18 +118,8 @@ class DownloadJob(Job): Job.__init__(self, url) self.pathfmt = util.PathFormat(self.extractor) self.downloaders = {} - self.queue = None self.out = output.select() - def run(self): - Job.run(self) - if self.queue: - for url in self.queue: - try: - DownloadJob(url).run() - except exception.NoExtractorError: - pass - def handle_url(self, url, keywords): """Download the resource specified in 'url'""" self.pathfmt.set_keywords(keywords) @@ -144,11 +134,10 @@ class DownloadJob(Job): self.pathfmt.set_directory(keywords) def handle_queue(self, url): - """Add url to work-queue""" try: - self.queue.append(url) - except AttributeError: - self.queue = [url] + DownloadJob(url).run() + except exception.NoExtractorError: + pass def handle_headers(self, headers): self.get_downloader("http:").set_headers(headers)