From f799e70e18a392704a11536576ad5a37d92ddba6 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 2 Sep 2012 20:47:24 +0200 Subject: [PATCH] Only try and remove old folders once. fix #786 --- couchpotato/core/plugins/renamer/main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py index 9a443ed..437374e 100644 --- a/couchpotato/core/plugins/renamer/main.py +++ b/couchpotato/core/plugins/renamer/main.py @@ -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: