Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-26 04:32:51 +01:00
Code Issues Releases Wiki Activity

restore skip actions with download archive

Browse Source
This commit is contained in:
Mike Fährmann 2018-02-12 16:56:45 +01:00
parent c0dd922c13
commit 4d2fadfb6f
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gallery_dl/job.py
View File

@ -160,8 +160,7 @@ class DownloadJob(Job):
# prepare download
self.pathfmt.set_keywords(keywords)
if self.pathfmt.exists() or \
self.archive and self.archive.check(keywords):
if self.pathfmt.exists(self.archive):
self.out.skip(self.pathfmt.path)
return
@ -172,7 +171,7 @@ class DownloadJob(Job):
if not self.get_downloader(url).download(url, self.pathfmt):
# use fallback URLs if available
for num, url in enumerate(fallback or [], 1):
for num, url in enumerate(fallback or (), 1):
self.log.info("Trying fallback URL #%d", num)
if self.get_downloader(url).download(url, self.pathfmt):
break
@ -182,7 +181,7 @@ class DownloadJob(Job):
"Failed to download %s", self.pathfmt.filename)
return
# download successful
# download succeeded
if self.archive:
self.archive.add()

41
gallery_dl/util.py
View File

@ -362,22 +362,31 @@ class PathFormat():
if os.altsep:
self.basedirectory = self.basedirectory.replace(os.altsep, os.sep)
skipmode = extractor.config("skip", True)
if skipmode == "abort":
self.exists = self._exists_abort
elif skipmode == "exit":
self.exists = self._exists_exit
elif not skipmode:
self.exists = lambda: False
skip = extractor.config("skip", True)
if skip:
if skip == "abort":
self._skipexc = exception.StopExtraction
elif skip == "exit":
self._skipexc = exit
else:
self._skipexc = None
else:
self.exists = lambda x=None: False
def open(self, mode="wb"):
"""Open file and return a corresponding file object"""
return open(self.partpath or self.realpath, mode)
def exists(self):
"""Return True if 'path' is complete and refers to an existing path"""
if self.has_extension:
return os.path.exists(self.realpath)
def exists(self, archive=None):
if (self.has_extension and os.path.exists(self.realpath) or
archive and archive.check(self.keywords)):
if self._skipexc:
raise self._skipexc()
if not self.has_extension:
self.set_extension("")
if self.path[-1] == ".":
self.path = self.path[:-1]
return True
return False
def set_directory(self, keywords):
@ -462,16 +471,6 @@ class PathFormat():
shutil.copyfile(self.partpath, self.realpath)
os.unlink(self.partpath)
def _exists_abort(self):
if self.has_extension and os.path.exists(self.realpath):
raise exception.StopExtraction()
return False
def _exists_exit(self):
if self.has_extension and os.path.exists(self.realpath):
exit()
return False
@staticmethod
def adjust_path(path):
"""Enable longer-than-260-character paths on windows"""