delay initialization of PathFormat objects

This allows the DeviantArt group-check to be moved inside the
Extractor.items() method which in turn allows for better exception
handling.

As a new general rule:
Never raise exceptions during extractor initialization.
This commit is contained in:
Mike Fährmann
2017-12-29 22:15:57 +01:00
parent c24e0e70a7
commit 88bb0798fd
2 changed files with 12 additions and 11 deletions

View File

@@ -137,8 +137,8 @@ class DownloadJob(Job):
def __init__(self, url, parent=None):
Job.__init__(self, url, parent)
self.pathfmt = util.PathFormat(self.extractor)
self.sleep = self.extractor.config("sleep")
self.pathfmt = None
self.sleep = None
self.downloaders = {}
self.out = output.select()
@@ -155,6 +155,9 @@ class DownloadJob(Job):
def handle_directory(self, keywords):
"""Set and create the target directory for downloads"""
if not self.pathfmt:
self.pathfmt = util.PathFormat(self.extractor)
self.sleep = self.extractor.config("sleep")
self.pathfmt.set_directory(keywords)
def handle_queue(self, url, keywords):