From ffa05d4c8a79f9ba256641008d35822831863050 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Thu, 1 Nov 2012 18:20:24 -0400 Subject: [PATCH] Strip leading/trailing whitespace from FOLDER_FORMAT, FILE_FORMAT --- headphones/postprocessor.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index 00d4b78d..b8a7eb6e 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -462,8 +462,7 @@ def moveFiles(albumpath, release, tracks): '$first': firstchar.lower() } - - folder = helpers.replace_all(headphones.FOLDER_FORMAT, values) + folder = helpers.replace_all(headphones.FOLDER_FORMAT.strip(), values) folder = folder.replace('./', '_/').replace(':','_').replace('?','_').replace('/.','/_').replace('<','_').replace('>','_') if folder.endswith('.'): @@ -503,7 +502,7 @@ def moveFiles(albumpath, release, tracks): else: make_lossy_folder = True - last_folder = headphones.FOLDER_FORMAT.split('/')[-1] + last_folder = headphones.FOLDER_FORMAT.strip().split('/')[-1] if make_lossless_folder: # Only rename the folder if they use the album name, otherwise merge into existing folder @@ -751,7 +750,7 @@ def renameFiles(albumpath, downloaded_track_list, release): ext = os.path.splitext(downloaded_track)[1] - new_file_name = helpers.replace_all(headphones.FILE_FORMAT, values).replace('/','_') + ext + new_file_name = helpers.replace_all(headphones.FILE_FORMAT.strip(), values).replace('/','_') + ext new_file_name = new_file_name.replace('?','_').replace(':', '_').encode(headphones.SYS_ENCODING)