From 03a3e2909771d7d9aba573e9713e80b2d46876a7 Mon Sep 17 00:00:00 2001 From: RemixDev Date: Thu, 27 Feb 2020 18:03:50 +0100 Subject: [PATCH] fixed path standard in windows --- deemix/utils/pathtemplates.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deemix/utils/pathtemplates.py b/deemix/utils/pathtemplates.py index 4b2822f..92571a2 100644 --- a/deemix/utils/pathtemplates.py +++ b/deemix/utils/pathtemplates.py @@ -123,7 +123,7 @@ def settingsRegex(filename, track, settings, playlist=None): filename = filename.replace("%position%", pad(track['position'], playlist['nb_tracks'], settings['padTracks'])) else: filename = filename.replace("%position%", pad(track['trackNumber'], track['album']['trackTotal'], settings['padTracks'])) - filename = re.sub(r'[/\\]', pathSep, filename) + filename = filename.replace('\\', pathSep).replace('/', pathSep) return antiDot(fixLongName(filename)) def settingsRegexAlbum(foldername, album, settings): @@ -144,13 +144,13 @@ def settingsRegexAlbum(foldername, album, settings): foldername = foldername.replace("%date%", "{}-{}-{}".format(str(album['date']['year']), str(album['date']['month']), str(album['date']['day']))) foldername = foldername.replace("%bitrate%", bitrateLabels[int(album['bitrate'])]) - foldername = re.sub(r'[/\\]', pathSep, foldername) + foldername = foldername.replace('\\', pathSep).replace('/', pathSep) return antiDot(fixLongName(foldername)) def settingsRegexArtist(foldername, artist, settings): foldername = foldername.replace("%artist%", fixName(artist['name'], settings['illegalCharacterReplacer'])) foldername = foldername.replace("%artist_id%", str(artist['id'])) - foldername = re.sub(r'[/\\]', pathSep, foldername) + foldername = foldername.replace('\\', pathSep).replace('/', pathSep) return antiDot(fixLongName(foldername)) def settingsRegexPlaylist(foldername, playlist, settings): @@ -160,5 +160,5 @@ def settingsRegexPlaylist(foldername, playlist, settings): foldername = foldername.replace("%owner_id%", str(playlist['creator']['id'])) foldername = foldername.replace("%year%", str(playlist['creation_date'][:4])) foldername = foldername.replace("%date%", str(playlist['creation_date'][:10])) - foldername = re.sub(r'[/\\]', pathSep, foldername) + foldername = foldername.replace('\\', pathSep).replace('/', pathSep) return antiDot(fixLongName(foldername))