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

Remove empty folder when found better quality. fix #735

Browse Source
This commit is contained in:
Ruud
2012-08-26 15:42:26 +02:00
parent ada4710a0a
commit cf86948c13
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/renamer/main.py
+9 -3
View File
@@ -327,6 +327,11 @@ class Renamer(Plugin):
try: try:
if os.path.isfile(src): if os.path.isfile(src):
os.remove(src) 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)
except: except:
log.error('Failed removing %s: %s', (src, traceback.format_exc())) log.error('Failed removing %s: %s', (src, traceback.format_exc()))
self.tagDir(group, 'failed_remove') self.tagDir(group, 'failed_remove')
@@ -464,8 +469,9 @@ class Renamer(Plugin):
def replaceDoubles(self, string): def replaceDoubles(self, string):
return string.replace(' ', ' ').replace(' .', '.') return string.replace(' ', ' ').replace(' .', '.')
def deleteEmptyFolder(self, folder): def deleteEmptyFolder(self, folder, show_error = True):
loge = log.error if show_error else log.debug
for root, dirs, files in os.walk(folder): for root, dirs, files in os.walk(folder):
for dir_name in dirs: for dir_name in dirs:
@@ -474,9 +480,9 @@ class Renamer(Plugin):
try: try:
os.rmdir(full_path) os.rmdir(full_path)
except: except:
log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc())) loge('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
try: try:
os.rmdir(folder) os.rmdir(folder)
except: except:
log.error('Couldn\'t remove empty directory %s: %s', (folder, traceback.format_exc())) loge('Couldn\'t remove empty directory %s: %s', (folder, traceback.format_exc()))