|
|
@ -315,7 +315,7 @@ class DownloadJob(Job):
|
|
|
|
pathfmt.build_path()
|
|
|
|
pathfmt.build_path()
|
|
|
|
|
|
|
|
|
|
|
|
if pathfmt.exists():
|
|
|
|
if pathfmt.exists():
|
|
|
|
if archive:
|
|
|
|
if archive and self._archive_write_skip:
|
|
|
|
archive.add(kwdict)
|
|
|
|
archive.add(kwdict)
|
|
|
|
self.handle_skip()
|
|
|
|
self.handle_skip()
|
|
|
|
return
|
|
|
|
return
|
|
|
@ -345,7 +345,7 @@ class DownloadJob(Job):
|
|
|
|
return
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
if not pathfmt.temppath:
|
|
|
|
if not pathfmt.temppath:
|
|
|
|
if archive:
|
|
|
|
if archive and self._archive_write_skip:
|
|
|
|
archive.add(kwdict)
|
|
|
|
archive.add(kwdict)
|
|
|
|
self.handle_skip()
|
|
|
|
self.handle_skip()
|
|
|
|
return
|
|
|
|
return
|
|
|
@ -359,7 +359,7 @@ class DownloadJob(Job):
|
|
|
|
pathfmt.finalize()
|
|
|
|
pathfmt.finalize()
|
|
|
|
self.out.success(pathfmt.path)
|
|
|
|
self.out.success(pathfmt.path)
|
|
|
|
self._skipcnt = 0
|
|
|
|
self._skipcnt = 0
|
|
|
|
if archive:
|
|
|
|
if archive and self._archive_write_file:
|
|
|
|
archive.add(kwdict)
|
|
|
|
archive.add(kwdict)
|
|
|
|
if "after" in hooks:
|
|
|
|
if "after" in hooks:
|
|
|
|
for callback in hooks["after"]:
|
|
|
|
for callback in hooks["after"]:
|
|
|
@ -561,6 +561,16 @@ class DownloadJob(Job):
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
extr.log.debug("Using download archive '%s'", archive_path)
|
|
|
|
extr.log.debug("Using download archive '%s'", archive_path)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
events = cfg("archive-event")
|
|
|
|
|
|
|
|
if events is None:
|
|
|
|
|
|
|
|
self._archive_write_file = True
|
|
|
|
|
|
|
|
self._archive_write_skip = False
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
if isinstance(events, str):
|
|
|
|
|
|
|
|
events = events.split(",")
|
|
|
|
|
|
|
|
self._archive_write_file = ("file" in events)
|
|
|
|
|
|
|
|
self._archive_write_skip = ("skip" in events)
|
|
|
|
|
|
|
|
|
|
|
|
skip = cfg("skip", True)
|
|
|
|
skip = cfg("skip", True)
|
|
|
|
if skip:
|
|
|
|
if skip:
|
|
|
|
self._skipexc = None
|
|
|
|
self._skipexc = None
|
|
|
@ -676,7 +686,7 @@ class SimulationJob(DownloadJob):
|
|
|
|
kwdict["extension"] = "jpg"
|
|
|
|
kwdict["extension"] = "jpg"
|
|
|
|
if self.sleep:
|
|
|
|
if self.sleep:
|
|
|
|
self.extractor.sleep(self.sleep(), "download")
|
|
|
|
self.extractor.sleep(self.sleep(), "download")
|
|
|
|
if self.archive:
|
|
|
|
if self.archive and self._archive_write_skip:
|
|
|
|
self.archive.add(kwdict)
|
|
|
|
self.archive.add(kwdict)
|
|
|
|
self.out.skip(self.pathfmt.build_filename(kwdict))
|
|
|
|
self.out.skip(self.pathfmt.build_filename(kwdict))
|
|
|
|
|
|
|
|
|
|
|
|