fixed custom regex

This commit is contained in:
Martin Wagner
2021-08-05 23:24:18 +02:00
parent e5120c4336
commit cc1b34c4b7

View File

@ -751,13 +751,13 @@ class Client(MPDClient):
if lib_path is not None: if lib_path is not None:
regex_str=self._settings.get_value("regex")[active_profile] regex_str=self._settings.get_value("regex")[active_profile]
if regex_str: if regex_str:
regex_str=regex_str.replace("%AlbumArtist%", song["albumartist"][0]) regex_str=regex_str.replace("%AlbumArtist%", re.escape(song["albumartist"][0]))
regex_str=regex_str.replace("%Album%", song["album"][0]) regex_str=regex_str.replace("%Album%", re.escape(song["album"][0]))
try: try:
regex=re.compile(regex_str, flags=re.IGNORECASE) regex=re.compile(regex_str, flags=re.IGNORECASE)
except: except re.error:
print("illegal regex:", regex_str) print("illegal regex:", regex_str)
return (None, None) return None
else: else:
regex=re.compile(COVER_REGEX, flags=re.IGNORECASE) regex=re.compile(COVER_REGEX, flags=re.IGNORECASE)
song_dir=os.path.join(lib_path, os.path.dirname(song_file)) song_dir=os.path.join(lib_path, os.path.dirname(song_file))