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

allow setting 'filename' & '(base-)directory' to default

Browse Source 
by setting them to 'None'/'null'
This commit is contained in:
Mike Fährmann
2021-02-23 02:43:51 +01:00
parent e5735361ed
commit 970fc2b2b5
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gallery_dl/util.py
View File

@@ -731,21 +731,25 @@ class PathFormat():
} }
def __init__(self, extractor): def __init__(self, extractor):
filename_fmt = extractor.config("filename", extractor.filename_fmt) filename_fmt = extractor.config("filename")
directory_fmt = extractor.config("directory", extractor.directory_fmt) if filename_fmt is None:
kwdefault = extractor.config("keywords-default") filename_fmt = extractor.filename_fmt
directory_fmt = extractor.config("directory")
if directory_fmt is None:
directory_fmt = extractor.directory_fmt
extension_map = extractor.config("extension-map") extension_map = extractor.config("extension-map")
if extension_map is None: if extension_map is None:
extension_map = self.EXTENSION_MAP extension_map = self.EXTENSION_MAP
self.extension_map = extension_map.get self.extension_map = extension_map.get
kwdefault = extractor.config("keywords-default")
try: try:
self.filename_formatter = Formatter( self.filename_formatter = Formatter(
filename_fmt, kwdefault).format_map filename_fmt, kwdefault).format_map
except Exception as exc: except Exception as exc:
raise exception.FilenameFormatError(exc) raise exception.FilenameFormatError(exc)
try: try:
self.directory_formatters = [ self.directory_formatters = [
Formatter(dirfmt, kwdefault).format_map Formatter(dirfmt, kwdefault).format_map
@@ -754,20 +758,23 @@ class PathFormat():
except Exception as exc: except Exception as exc:
raise exception.DirectoryFormatError(exc) raise exception.DirectoryFormatError(exc)
self.directory = self.realdirectory = ""
self.filename = self.extension = self.prefix = ""
self.path = self.realpath = self.temppath = ""
self.kwdict = {} self.kwdict = {}
self.directory = self.realdirectory = \
self.filename = self.extension = self.prefix = \
self.path = self.realpath = self.temppath = ""
self.delete = self._create_directory = False self.delete = self._create_directory = False
basedir = extractor._parentdir basedir = extractor._parentdir
if not basedir: if not basedir:
basedir = expand_path( basedir = extractor.config("base-directory")
extractor.config("base-directory", (".", "gallery-dl"))) if basedir is None:
if os.altsep and os.altsep in basedir: basedir = "." + os.sep + "gallery-dl" + os.sep
basedir = basedir.replace(os.altsep, os.sep) else:
if basedir[-1] != os.sep: basedir = expand_path(basedir)
basedir += os.sep if os.altsep and os.altsep in basedir:
basedir = basedir.replace(os.altsep, os.sep)
if basedir[-1] != os.sep:
basedir += os.sep
self.basedirectory = basedir self.basedirectory = basedir
restrict = extractor.config("path-restrict", "auto") restrict = extractor.config("path-restrict", "auto")