From 08d844fe3e644ae6cd9bea34a3b4982e61129f33 Mon Sep 17 00:00:00 2001 From: Zotify Date: Sun, 1 Sep 2024 18:47:51 +1200 Subject: [PATCH] platform agnostic special char stripping --- zotify/utils.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/zotify/utils.py b/zotify/utils.py index dce9fd2..df8a661 100644 --- a/zotify/utils.py +++ b/zotify/utils.py @@ -12,7 +12,7 @@ import music_tag import requests from zotify.const import ARTIST, GENRE, TRACKTITLE, ALBUM, YEAR, DISCNUMBER, TRACKNUMBER, ARTWORK, \ - WINDOWS_SYSTEM, LINUX_SYSTEM, ALBUMARTIST + WINDOWS_SYSTEM, ALBUMARTIST from zotify.zotify import Zotify @@ -258,12 +258,7 @@ def fix_filename(name): >>> all('_' == fix_filename(chr(i)) for i in list(range(32))) True """ - if platform.system() == WINDOWS_SYSTEM: - return re.sub(r'[/\\:|<>"?*\0-\x1f]|^(AUX|COM[1-9]|CON|LPT[1-9]|NUL|PRN)(?![^.])|^\s|[\s.]$', "_", str(name), flags=re.IGNORECASE) - elif platform.system() == LINUX_SYSTEM: - return re.sub(r'[/\0]', "_", str(name)) - else: # MacOS - return re.sub(r'[/:\0]', "_", str(name)) + return re.sub(r'[/\\:|<>"?*\0-\x1f]|^(AUX|COM[1-9]|CON|LPT[1-9]|NUL|PRN)(?![^.])|^\s|[\s.]$', "_", str(name), flags=re.IGNORECASE) def fmt_seconds(secs: float) -> str: