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

adjust PathFormat class

Browse Source
This commit is contained in:
Mike Fährmann 2018-06-06 20:17:17 +02:00
parent d0ae3ed52c
commit 821535b458
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
3 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gallery_dl/downloader/common.py
View File

@ -47,7 +47,7 @@ class DownloaderBase():
# remove file from incomplete downloads
if self.downloading and not self.part:
try:
os.remove(pathfmt.realpath)
os.remove(pathfmt.temppath)
except (OSError, AttributeError):
pass
@ -127,10 +127,7 @@ class DownloaderBase():
self.downloading = False
if adj_ext:
pathfmt.adjust_extension(adj_ext)
if self.part:
pathfmt.part_move()
self.out.success(pathfmt.path, tries)
pathfmt.set_extension(adj_ext)
return True
def connect(self, url, offset):

2
gallery_dl/job.py
View File

@ -193,6 +193,8 @@ class DownloadJob(Job):
pp.run(self.pathfmt)
# download succeeded
self.pathfmt.finalize()
self.out.success(self.pathfmt.path, 0)
if self.archive:
self.archive.add(keywords)

44
gallery_dl/util.py
View File

@ -363,7 +363,7 @@ class PathFormat():
self.keywords = {}
self.filename = ""
self.directory = self.realdirectory = ""
self.path = self.realpath = self.partpath = ""
self.path = self.realpath = self.temppath = ""
self.basedirectory = expand_path(
extractor.config("base-directory", (".", "gallery-dl")))
@ -383,7 +383,7 @@ class PathFormat():
def open(self, mode="wb"):
"""Open file and return a corresponding file object"""
return open(self.partpath or self.realpath, mode)
return open(self.temppath, mode)
def exists(self, archive=None):
"""Return True if the file exists on disk or in 'archive'"""
@ -435,13 +435,6 @@ class PathFormat():
self.keywords["extension"] = extension
self.build_path()
def adjust_extension(self, extension):
"""Change filename extension of existing file"""
oldpath = self.realpath
self.set_extension(extension)
if not self.partpath:
os.replace(oldpath, self.realpath)
def build_path(self):
"""Use filename-keywords and directory to build a full path"""
try:
@ -453,38 +446,43 @@ class PathFormat():
filename = os.sep + self.filename
self.path = self.directory + filename
self.realpath = self.realdirectory + filename
if not self.temppath:
self.temppath = self.realpath
def part_enable(self, part_directory=None):
"""Enable .part file usage"""
if self.has_extension:
self.partpath = self.realpath + ".part"
self.temppath = self.realpath + ".part"
else:
self.set_extension("part", False)
self.partpath = self.realpath
self.temppath = self.realpath
if part_directory:
self.partpath = os.path.join(
self.temppath = os.path.join(
part_directory,
os.path.basename(self.partpath),
os.path.basename(self.temppath),
)
def part_size(self):
"""Return size of .part file"""
if self.partpath:
try:
return os.stat(self.partpath).st_size
except OSError:
pass
try:
return os.stat(self.temppath).st_size
except OSError:
pass
return 0
def part_move(self):
"""Rename .part file to its actual filename"""
def finalize(self):
"""Move tempfile to its target location"""
if self.temppath == self.realpath:
return
try:
os.replace(self.partpath, self.realpath)
os.replace(self.temppath, self.realpath)
return
except OSError:
pass
shutil.copyfile(self.partpath, self.realpath)
os.unlink(self.partpath)
shutil.copyfile(self.temppath, self.realpath)
os.unlink(self.temppath)
@staticmethod
def adjust_path(path):