From 029d9ffb7e32afec8bb65f07a50866442d5b8706 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Sun, 20 Mar 2022 02:30:23 +0100 Subject: [PATCH] When replacing filename pattern strings only log the ones we're seeing in config file --- mvw-dl.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mvw-dl.py b/mvw-dl.py index f5509e3..acfea6a 100644 --- a/mvw-dl.py +++ b/mvw-dl.py @@ -374,13 +374,17 @@ def filename_replace_pattern( show_attrs = [attr for attr in dir(show) if not attr.startswith('_') and not callable(getattr(show, attr))] for attr in show_attrs: - # log.debug(f"{shorthand_uuid} Replacing filename pattern '&({attr})s' ...") - filename = re.sub(r"&\(" + re.escape(attr) + r"\)s", str(getattr(show, attr)), filename) - # log.debug(f"{shorthand_uuid} New filename: '{filename}'") + attr_re = re.compile(r"&\(" + re.escape(attr) + r"\)s") + if re.search(attr_re, filename): + log.debug(f"{shorthand_uuid} Replacing filename pattern '&({attr})s' ...") + filename = re.sub(attr_re, str(getattr(show, attr)), filename) + log.debug(f"{shorthand_uuid} New filename: '{filename}'") for extended_attr in show_extended: - # log.debug(f"{shorthand_uuid} Replacing filename pattern '&({extended_attr})s' ...") - filename = re.sub(r"&\(" + re.escape(extended_attr) + r"\)s", show_extended[extended_attr], filename) - # log.debug(f"{shorthand_uuid} New filename: '{filename}'") + extended_attr_re = re.compile(r"&\(" + re.escape(extended_attr) + r"\)s") + if re.search(extended_attr_re, filename): + log.debug(f"{shorthand_uuid} Replacing filename pattern '&({extended_attr})s' ...") + filename = re.sub(extended_attr_re, show_extended[extended_attr], filename) + log.debug(f"{shorthand_uuid} New filename: '{filename}'") return filename