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

[pp:metadata] fix using '..' in directories on Windows (#5942, #6094)

Browse Source
This commit is contained in:
Mike Fährmann 2024-08-27 14:38:40 +02:00
parent f669b3f046
commit eef5beb841
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gallery_dl/path.py
View File

@ -184,29 +184,31 @@ class PathFormat():
def set_directory(self, kwdict): def set_directory(self, kwdict):
"""Build directory path and create it if necessary""" """Build directory path and create it if necessary"""
self.kwdict = kwdict self.kwdict = kwdict
sep = os.sep
segments = self.build_directory(kwdict) segments = self.build_directory(kwdict)
if segments: if segments:
self.directory = directory = self.basedirectory + self.clean_path( self.directory = directory = self.basedirectory + self.clean_path(
sep.join(segments) + sep) os.sep.join(segments) + os.sep)
else: else:
self.directory = directory = self.basedirectory self.directory = directory = self.basedirectory
if WINDOWS and self.extended: if WINDOWS and self.extended:
# Enable longer-than-260-character paths directory = self._extended_path(directory)
directory = os.path.abspath(directory)
if directory.startswith("\\\\"):
directory = "\\\\?\\UNC\\" + directory[2:]
else:
directory = "\\\\?\\" + directory
# abspath() in Python 3.7+ removes trailing path separators (#402)
if directory[-1] != sep:
directory += sep
self.realdirectory = directory self.realdirectory = directory
def _extended_path(self, path):
# Enable longer-than-260-character paths
path = os.path.abspath(path)
if not path.startswith("\\\\"):
path = "\\\\?\\" + path
elif not path.startswith("\\\\?\\"):
path = "\\\\?\\UNC\\" + path[2:]
# abspath() in Python 3.7+ removes trailing path separators (#402)
if path[-1] != os.sep:
return path + os.sep
return path
def set_filename(self, kwdict): def set_filename(self, kwdict):
"""Set general filename data""" """Set general filename data"""
self.kwdict = kwdict self.kwdict = kwdict

5
gallery_dl/postprocessor/metadata.py
View File

@ -114,7 +114,10 @@ class MetadataPP(PostProcessor):
if archive and archive.check(pathfmt.kwdict): if archive and archive.check(pathfmt.kwdict):
return return
directory = self._directory(pathfmt) if util.WINDOWS and pathfmt.extended:
directory = pathfmt._extended_path(self._directory(pathfmt))
else:
directory = self._directory(pathfmt)
path = directory + self._filename(pathfmt) path = directory + self._filename(pathfmt)
if self.skip and os.path.exists(path): if self.skip and os.path.exists(path):