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

Merge branch 'permissions' into develop

Browse Source
This commit is contained in:
Remy
2011-08-12 18:14:35 -07:00
parent 2352224af1 21a9fdfcc8
commit 4523d1a9c9
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
headphones/postprocessor.py
View File

@@ -314,26 +314,18 @@ def moveFiles(albumpath, release, tracks):
if os.path.exists(destination_path):
i = 1
while True:
new_folder_name = destination_path + '[%i]' % i
if os.path.exists(new_folder_name):
newfolder = folder + '[%i]' % i
destination_path = os.path.normpath(os.path.join(headphones.DESTINATION_DIR, newfolder))
if os.path.exists(destination_path):
i += 1
else:
destination_path = new_folder_name
folder = newfolder
break
logger.info('Moving files from %s to %s' % (albumpath, destination_path))
try:
os.makedirs(destination_path)
# Chmod the directories using the folder_format (script courtesy of premiso!)
folder_list = folder.split('/')
temp_f = os.path.join(headphones.DESTINATION_DIR);
for f in folder_list:
temp_f = os.path.join(temp_f, f)
os.chmod(temp_f, int(headphones.FOLDER_PERMISSIONS, 8))
except Exception, e:
logger.error('Could not create folder for %s. Not moving: %s' % (release['AlbumTitle'], e))
@@ -343,6 +335,14 @@ def moveFiles(albumpath, release, tracks):
for files in f:
shutil.move(os.path.join(r, files), destination_path)
# Chmod the directories using the folder_format (script courtesy of premiso!)
folder_list = folder.split('/')
temp_f = headphones.DESTINATION_DIR
for f in folder_list:
temp_f = os.path.join(temp_f, f)
os.chmod(temp_f, int(headphones.FOLDER_PERMISSIONS, 8))
try:
shutil.rmtree(albumpath)
except Exception, e: