From 2ca011dfa8896bfdf0c36cf85f6cb64c8ff4222a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 20 Jun 2021 20:11:32 +0200 Subject: [PATCH] add 'kwdict' argument to PathFormat.build_filename() --- gallery_dl/postprocessor/metadata.py | 2 +- gallery_dl/util.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gallery_dl/postprocessor/metadata.py b/gallery_dl/postprocessor/metadata.py index ef1d304b..c7216125 100644 --- a/gallery_dl/postprocessor/metadata.py +++ b/gallery_dl/postprocessor/metadata.py @@ -89,7 +89,7 @@ class MetadataPP(PostProcessor): ext = kwdict.get("extension") kwdict["extension"] = pathfmt.extension kwdict["extension"] = pathfmt.prefix + self._extension_fmt(kwdict) - filename = pathfmt.build_filename() + filename = pathfmt.build_filename(kwdict) kwdict["extension"] = ext return filename diff --git a/gallery_dl/util.py b/gallery_dl/util.py index a6c4c430..a4188082 100644 --- a/gallery_dl/util.py +++ b/gallery_dl/util.py @@ -931,17 +931,15 @@ class PathFormat(): self.temppath = self.realpath = self.realpath[:-1] return True - def build_filename(self): + def build_filename(self, kwdict): """Apply 'kwdict' to filename format string""" try: return self.clean_path(self.clean_segment( - self.filename_formatter(self.kwdict))) + self.filename_formatter(kwdict))) except Exception as exc: raise exception.FilenameFormatError(exc) - def build_filename_conditional(self): - kwdict = self.kwdict - + def build_filename_conditional(self, kwdict): try: for condition, formatter in self.filename_conditions: if condition(kwdict): @@ -994,7 +992,7 @@ class PathFormat(): if self._create_directory: os.makedirs(self.realdirectory, exist_ok=True) self._create_directory = False - self.filename = filename = self.build_filename() + self.filename = filename = self.build_filename(self.kwdict) self.path = self.directory + filename self.realpath = self.realdirectory + filename if not self.temppath: