[pp:metadata] fix 'directory' when file directory has conditions (#5728)

pull/5870/head
Mike Fährmann 2 months ago
parent 1527ad79e2
commit 1656c9287d
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -51,6 +51,7 @@ class PathFormat():
raise exception.FilenameFormatError(exc)
directory_fmt = config("directory")
self.directory_conditions = ()
try:
if directory_fmt is None:
directory_fmt = extractor.directory_fmt

@ -155,12 +155,15 @@ class MetadataPP(PostProcessor):
def _directory_format(self, pathfmt):
formatters = pathfmt.directory_formatters
conditions = pathfmt.directory_conditions
try:
pathfmt.directory_formatters = self._directory_formatters
pathfmt.directory_conditions = ()
segments = pathfmt.build_directory(pathfmt.kwdict)
directory = pathfmt.clean_path(os.sep.join(segments) + os.sep)
return os.path.join(pathfmt.realdirectory, directory)
finally:
pathfmt.directory_conditions = conditions
pathfmt.directory_formatters = formatters
def _filename(self, pathfmt):

Loading…
Cancel
Save