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

Cleaner empty dir cleanup

Browse Source
This commit is contained in:
Ruud
2014-06-03 22:49:12 +02:00
parent 4b236c6ed6
commit ab2b2cfe6e
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
couchpotato/core/plugins/base.py
View File

@@ -143,34 +143,22 @@ class Plugin(object):
def deleteEmptyFolder(self, folder, show_error = True, only_clean = None):
folder = sp(folder)
allowed_dirs = []
if only_clean:
for item in os.listdir(folder):
full_path = os.path.join(folder, item)
if item in only_clean and os.path.isdir(full_path):
allowed_dirs.append(full_path)
for item in os.listdir(folder):
full_folder = os.path.join(folder, item)
for root, dirs, files in os.walk(folder):
if not only_clean or (item in only_clean and os.path.isdir(full_folder)):
for dir_name in dirs:
full_path = os.path.join(root, dir_name)
for root, dirs, files in os.walk(full_folder):
if only_clean:
allow = False
for allowed_dir in allowed_dirs:
if allowed_dir in full_path:
allow = True
break
for dir_name in dirs:
full_path = os.path.join(root, dir_name)
if not allow:
continue
if len(os.listdir(full_path)) == 0:
try:
os.rmdir(full_path)
except:
if show_error:
log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
if len(os.listdir(full_path)) == 0:
try:
os.rmdir(full_path)
except:
if show_error:
log.error('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
try:
os.rmdir(folder)