gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-02 09:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Strip leading/trailing whitespace from FOLDER_FORMAT, FILE_FORMAT

Browse Source
This commit is contained in:
rembo10
2012-11-01 18:20:24 -04:00
parent 0a000342c1
commit ffa05d4c8a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
headphones/postprocessor.py
View File

@@ -462,8 +462,7 @@ def moveFiles(albumpath, release, tracks):
'$first': firstchar.lower() '$first': firstchar.lower()
} }
folder = helpers.replace_all(headphones.FOLDER_FORMAT.strip(), values)
folder = helpers.replace_all(headphones.FOLDER_FORMAT, values)
folder = folder.replace('./', '_/').replace(':','_').replace('?','_').replace('/.','/_').replace('<','_').replace('>','_') folder = folder.replace('./', '_/').replace(':','_').replace('?','_').replace('/.','/_').replace('<','_').replace('>','_')
if folder.endswith('.'): if folder.endswith('.'):
@@ -503,7 +502,7 @@ def moveFiles(albumpath, release, tracks):
else: else:
make_lossy_folder = True make_lossy_folder = True
last_folder = headphones.FOLDER_FORMAT.split('/')[-1] last_folder = headphones.FOLDER_FORMAT.strip().split('/')[-1]
if make_lossless_folder: if make_lossless_folder:
# Only rename the folder if they use the album name, otherwise merge into existing 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] 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) new_file_name = new_file_name.replace('?','_').replace(':', '_').encode(headphones.SYS_ENCODING)