dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only try and remove old folders once. fix #786

Browse Source
This commit is contained in:
Ruud
2012-09-02 20:47:24 +02:00
parent b121a2e827
commit f799e70e18
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer/main.py
+7 -2
View File
@@ -314,6 +314,7 @@ class Renamer(Plugin):
break
# Remove files
delete_folders = []
for src in remove_files:
if isinstance(src, File):
@@ -329,13 +330,17 @@ class Renamer(Plugin):
os.remove(src)
parent_dir = os.path.normpath(os.path.dirname(src))
if os.path.isdir(parent_dir) and destination != parent_dir:
self.deleteEmptyFolder(parent_dir, show_error = False)
if delete_folders.count(parent_dir) == 0 and os.path.isdir(parent_dir) and destination != parent_dir:
delete_folders.append(parent_dir)
except:
log.error('Failed removing %s: %s', (src, traceback.format_exc()))
self.tagDir(group, 'failed_remove')
# Delete leftover folder from older releases
for delete_folder in delete_folders:
self.deleteEmptyFolder(delete_folder, show_error = False)
# Rename all files marked
group['renamed_files'] = []
for src in rename_files: