From 89daa836e75948f74e4725ea7e716dc243faaedd Mon Sep 17 00:00:00 2001 From: mano3m Date: Sun, 1 Sep 2013 01:05:53 +0200 Subject: [PATCH 1/2] Remove all empty folders Quite often there is a subfolder in the movie folder after extraction. This folder is deleted but the actual movie folder remains behind. This update fixes that in both cases: move_folder is known, or we work in the 'from' folder. --- couchpotato/core/plugins/renamer/main.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py index ad7df1cf..be886d42 100755 --- a/couchpotato/core/plugins/renamer/main.py +++ b/couchpotato/core/plugins/renamer/main.py @@ -477,8 +477,15 @@ class Renamer(Plugin): if group['dirname'] and group['parentdir'] and not self.downloadIsTorrent(download_info): try: - log.info('Deleting folder: %s', group['parentdir']) - self.deleteEmptyFolder(group['parentdir']) + if movie_folder: + # Delete the movie folder + group_folder = movie_folder + else: + # Delete the first empty subfolder in the tree relative to the 'from' folder + group_folder = os.path.join(self.conf('from'), os.path.relpath(group['parentdir'], self.conf('from')).split(os.path.sep)[0]) + + log.info('Deleting folder: %s', group_folder) + self.deleteEmptyFolder(group_folder) except: log.error('Failed removing %s: %s', (group['parentdir'], traceback.format_exc())) From 6174f121c869a726fbaabd900aceb285b162f8bd Mon Sep 17 00:00:00 2001 From: mano3m Date: Mon, 30 Sep 2013 19:27:11 +0200 Subject: [PATCH 2/2] fix log message --- couchpotato/core/plugins/renamer/main.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py index be886d42..ea7926eb 100755 --- a/couchpotato/core/plugins/renamer/main.py +++ b/couchpotato/core/plugins/renamer/main.py @@ -476,18 +476,18 @@ class Renamer(Plugin): log.error('Failed removing %s: %s', (release.identifier, traceback.format_exc())) if group['dirname'] and group['parentdir'] and not self.downloadIsTorrent(download_info): + if movie_folder: + # Delete the movie folder + group_folder = movie_folder + else: + # Delete the first empty subfolder in the tree relative to the 'from' folder + group_folder = os.path.join(self.conf('from'), os.path.relpath(group['parentdir'], self.conf('from')).split(os.path.sep)[0]) + try: - if movie_folder: - # Delete the movie folder - group_folder = movie_folder - else: - # Delete the first empty subfolder in the tree relative to the 'from' folder - group_folder = os.path.join(self.conf('from'), os.path.relpath(group['parentdir'], self.conf('from')).split(os.path.sep)[0]) - log.info('Deleting folder: %s', group_folder) self.deleteEmptyFolder(group_folder) except: - log.error('Failed removing %s: %s', (group['parentdir'], traceback.format_exc())) + log.error('Failed removing %s: %s', (group_folder, traceback.format_exc())) # Notify on download, search for trailers etc download_message = 'Downloaded %s (%s)' % (movie_title, replacements['quality'])