github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delay directory creation (#2461, #2474)

Browse Source 
Only call os.makedirs() when an open() call
fails with a FileNotFoundError

Might cause errors with some post processors etc,
but for now I was unable to find any.
This commit is contained in:
Mike Fährmann
2022-05-03 23:50:12 +02:00
parent 4c8e28db82
commit 99cb28724f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gallery_dl/path.py
View File

@@ -74,7 +74,7 @@ class PathFormat():
self.directory = self.realdirectory = \ self.directory = self.realdirectory = \
self.filename = self.extension = self.prefix = \ self.filename = self.extension = self.prefix = \
self.path = self.realpath = self.temppath = "" self.path = self.realpath = self.temppath = ""
self.delete = self._create_directory = False self.delete = False
extension_map = config("extension-map") extension_map = config("extension-map")
if extension_map is None: if extension_map is None:
@@ -138,7 +138,11 @@ class PathFormat():
def open(self, mode="wb"): def open(self, mode="wb"):
"""Open file and return a corresponding file object""" """Open file and return a corresponding file object"""
return open(self.temppath, mode) try:
return open(self.temppath, mode)
except FileNotFoundError:
os.makedirs(self.realdirectory, exist_ok=True)
return open(self.temppath, mode)
def exists(self): def exists(self):
"""Return True if the file exists on disk""" """Return True if the file exists on disk"""
@@ -187,7 +191,6 @@ class PathFormat():
directory += sep directory += sep
self.realdirectory = directory self.realdirectory = directory
self._create_directory = True
def set_filename(self, kwdict): def set_filename(self, kwdict):
"""Set general filename data""" """Set general filename data"""
@@ -279,9 +282,6 @@ class PathFormat():
def build_path(self): def build_path(self):
"""Combine directory and filename to full paths""" """Combine directory and filename to full paths"""
if self._create_directory:
os.makedirs(self.realdirectory, exist_ok=True)
self._create_directory = False
self.filename = filename = self.build_filename(self.kwdict) self.filename = filename = self.build_filename(self.kwdict)
self.path = self.directory + filename self.path = self.directory + filename
self.realpath = self.realdirectory + filename self.realpath = self.realdirectory + filename