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

[path] combine 'build_*' & 'build_*_conditional'

Browse Source
This commit is contained in:
Mike Fährmann
2025-12-17 19:45:38 +01:00
parent ff94002b44
commit 218dbdb3ca
1 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
gallery_dl/path.py
View File

@@ -31,6 +31,8 @@ class PathFormat():
if kwdefault is None: if kwdefault is None:
kwdefault = util.NONE kwdefault = util.NONE
self.filename_conditions = self.directory_conditions = None
filename_fmt = config("filename") filename_fmt = config("filename")
try: try:
if filename_fmt is None: if filename_fmt is None:
@@ -41,7 +43,6 @@ class PathFormat():
formatter.parse(fmt, kwdefault).format_map) formatter.parse(fmt, kwdefault).format_map)
for expr, fmt in filename_fmt.items() if expr for expr, fmt in filename_fmt.items() if expr
] ]
self.build_filename = self.build_filename_conditional
filename_fmt = filename_fmt.get("", extractor.filename_fmt) filename_fmt = filename_fmt.get("", extractor.filename_fmt)
self.filename_formatter = formatter.parse( self.filename_formatter = formatter.parse(
@@ -50,7 +51,6 @@ class PathFormat():
raise exception.FilenameFormatError(exc) raise exception.FilenameFormatError(exc)
directory_fmt = config("directory") directory_fmt = config("directory")
self.directory_conditions = ()
try: try:
if directory_fmt is None: if directory_fmt is None:
directory_fmt = extractor.directory_fmt directory_fmt = extractor.directory_fmt
@@ -62,7 +62,6 @@ class PathFormat():
]) ])
for expr, fmts in directory_fmt.items() if expr for expr, fmts in directory_fmt.items() if expr
] ]
self.build_directory = self.build_directory_conditional
directory_fmt = directory_fmt.get("", extractor.directory_fmt) directory_fmt = directory_fmt.get("", extractor.directory_fmt)
self.directory_formatters = [ self.directory_formatters = [
@@ -256,29 +255,33 @@ class PathFormat():
def build_filename(self, kwdict): def build_filename(self, kwdict):
"""Apply 'kwdict' to filename format string""" """Apply 'kwdict' to filename format string"""
try: try:
return self.clean_path(self.clean_segment( if self.filename_conditions is None:
self.filename_formatter(kwdict)))
except Exception as exc:
raise exception.FilenameFormatError(exc)
def build_filename_conditional(self, kwdict):
try:
for condition, fmt in self.filename_conditions:
if condition(kwdict):
break
else:
fmt = self.filename_formatter fmt = self.filename_formatter
else:
for condition, fmt in self.filename_conditions:
if condition(kwdict):
break
else:
fmt = self.filename_formatter
return self.clean_path(self.clean_segment(fmt(kwdict))) return self.clean_path(self.clean_segment(fmt(kwdict)))
except Exception as exc: except Exception as exc:
raise exception.FilenameFormatError(exc) raise exception.FilenameFormatError(exc)
def build_directory(self, kwdict): def build_directory(self, kwdict):
"""Apply 'kwdict' to directory format strings""" """Apply 'kwdict' to directory format strings"""
segments = []
strip = self.strip
try: try:
for fmt in self.directory_formatters: if self.directory_conditions is None:
formatters = self.directory_formatters
else:
for condition, formatters in self.directory_conditions:
if condition(kwdict):
break
else:
formatters = self.directory_formatters
segments = []
strip = self.strip
for fmt in formatters:
segment = fmt(kwdict).strip() segment = fmt(kwdict).strip()
if strip and segment not in {".", ".."}: if strip and segment not in {".", ".."}:
# remove trailing dots and spaces (#647) # remove trailing dots and spaces (#647)
@@ -289,26 +292,6 @@ class PathFormat():
except Exception as exc: except Exception as exc:
raise exception.DirectoryFormatError(exc) raise exception.DirectoryFormatError(exc)
def build_directory_conditional(self, kwdict):
segments = []
strip = self.strip
try:
for condition, formatters in self.directory_conditions:
if condition(kwdict):
break
else:
formatters = self.directory_formatters
for fmt in formatters:
segment = fmt(kwdict).strip()
if strip and segment != "..":
segment = segment.rstrip(strip)
if segment:
segments.append(self.clean_segment(segment))
return segments
except Exception as exc:
raise exception.DirectoryFormatError(exc)
def build_path(self): def build_path(self):
"""Combine directory and filename to full paths""" """Combine directory and filename to full paths"""
self.filename = filename = self.build_filename(self.kwdict) self.filename = filename = self.build_filename(self.kwdict)