From 5da27d32a1f522e80a3129c61f939b1934a0824a Mon Sep 17 00:00:00 2001 From: Logykk Date: Wed, 7 Feb 2024 18:10:08 +1300 Subject: [PATCH] version bump --- CHANGELOG.md | 4 ++++ setup.cfg | 2 +- zotify/const.py | 2 ++ zotify/utils.py | 9 +++++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e6ff1..17f30b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.6.13 +- Only replace chars with _ when required +- Added defaults to README + ## 0.6.12 - Dockerfile works again - Fixed lrc file extension replacement diff --git a/setup.cfg b/setup.cfg index af73781..1706618 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = zotify -version = 0.6.12 +version = 0.6.13 author = Zotify Contributors description = A highly customizable music and podcast downloader long_description = file: README.md diff --git a/zotify/const.py b/zotify/const.py index 770f6be..e269a90 100644 --- a/zotify/const.py +++ b/zotify/const.py @@ -92,6 +92,8 @@ USER_LIBRARY_READ = 'user-library-read' WINDOWS_SYSTEM = 'Windows' +LINUX_SYSTEM = 'Linux' + CODEC_MAP = { 'aac': 'aac', 'fdk_aac': 'libfdk_aac', diff --git a/zotify/utils.py b/zotify/utils.py index df8a661..dce9fd2 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, ALBUMARTIST + WINDOWS_SYSTEM, LINUX_SYSTEM, ALBUMARTIST from zotify.zotify import Zotify @@ -258,7 +258,12 @@ def fix_filename(name): >>> all('_' == fix_filename(chr(i)) for i in list(range(32))) True """ - return re.sub(r'[/\\:|<>"?*\0-\x1f]|^(AUX|COM[1-9]|CON|LPT[1-9]|NUL|PRN)(?![^.])|^\s|[\s.]$', "_", str(name), flags=re.IGNORECASE) + 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)) def fmt_seconds(secs: float) -> str: