From 7e30e7c952fc13ca7bf5b3bd31f19ac03963804f Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Fri, 14 May 2021 10:33:38 +0000 Subject: [PATCH] Apply PathFilter's filters to all the template's components Fixes #513. Signed-off-by: JoeLametta --- whipper/common/program.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/whipper/common/program.py b/whipper/common/program.py index 58cd9a4..8e5c449 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -206,27 +206,25 @@ class Program: if metadata: release = metadata.release or '0000' v['y'] = release[:4] - v['A'] = self._filter.filter(metadata.artist) - v['S'] = self._filter.filter(metadata.sortName) - v['d'] = self._filter.filter(metadata.title) + v['A'] = metadata.artist + v['S'] = metadata.sortName + v['d'] = metadata.title v['B'] = metadata.barcode v['C'] = metadata.catalogNumber if metadata.releaseType: v['R'] = metadata.releaseType v['r'] = metadata.releaseType.lower() if track_number is not None and track_number > 0: - v['a'] = self._filter.filter( - metadata.tracks[track_number - 1].artist) - v['s'] = self._filter.filter( - metadata.tracks[track_number - 1].sortName) - v['n'] = self._filter.filter( - metadata.tracks[track_number - 1].title) + v['a'] = metadata.tracks[track_number - 1].artist + v['s'] = metadata.tracks[track_number - 1].sortName + v['n'] = metadata.tracks[track_number - 1].title elif track_number == 0: # htoa defaults to disc's artist - v['a'] = self._filter.filter(metadata.artist) + v['a'] = metadata.artist template = re.sub(r'%(\w)', r'%(\1)s', template) - return os.path.join(outdir, template % v) + filtered_v = {k: self._filter.filter(v2) for k, v2 in v.items()} + return os.path.join(outdir, template % filtered_v) @staticmethod def getCDDB(cddbdiscid):