Merge branch 'develop'

This commit is contained in:
Remy
2011-08-20 20:18:02 -07:00
+2 -4
View File
@@ -344,8 +344,8 @@ def moveFiles(albumpath, release, tracks):
temp_f = headphones.DESTINATION_DIR temp_f = headphones.DESTINATION_DIR
for f in folder_list: for f in folder_list:
temp_f = os.path.join(temp_f, f).encode(headphones.SYS_ENCODING) temp_f = os.path.join(temp_f, f)
os.chmod(temp_f, int(headphones.FOLDER_PERMISSIONS, 8)) os.chmod(os.path.normpath(temp_f).encode(headphones.SYS_ENCODING), int(headphones.FOLDER_PERMISSIONS, 8))
try: try:
shutil.rmtree(albumpath) shutil.rmtree(albumpath)
@@ -497,8 +497,6 @@ def forcePostProcess():
# Parse the folder names to get artist album info # Parse the folder names to get artist album info
for folder in folders: for folder in folders:
folder = unicode(folder)
albumpath = os.path.join(download_dir, folder) albumpath = os.path.join(download_dir, folder)
try: try: