From 8f4219a93cd6105d9e7b60ffb8faa628fb2055ee Mon Sep 17 00:00:00 2001 From: mano3m Date: Thu, 3 Apr 2014 22:12:45 +0200 Subject: [PATCH] Check if folder exists in tagging Fixes #3069 --- couchpotato/core/plugins/renamer.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py index 1e83140..b04c96c 100644 --- a/couchpotato/core/plugins/renamer.py +++ b/couchpotato/core/plugins/renamer.py @@ -655,7 +655,7 @@ Remove it if you want it to be renamed (again, or at least let it try again) tag_files = release_download.get('files', []) # Tag all files in release folder - else: + elif release_download['folder']: for root, folders, names in scandir.walk(release_download['folder']): tag_files.extend([os.path.join(root, name) for name in names]) @@ -685,19 +685,20 @@ Remove it if you want it to be renamed (again, or at least let it try again) return False elif isinstance(release_download, dict): + + folder = release_download['folder'] + if not os.path.isdir(folder): + return False + # Untag download_files if they are known if release_download.get('files'): tag_files = release_download.get('files', []) # Untag all files in release folder else: - for root, folders, names in scandir.walk(release_download['folder']): + for root, folders, names in scandir.walk(folder): tag_files.extend([sp(os.path.join(root, name)) for name in names if not os.path.splitext(name)[1] == '.ignore']) - folder = release_download['folder'] - if not os.path.isdir(folder): - return False - if not folder: return False @@ -732,7 +733,7 @@ Remove it if you want it to be renamed (again, or at least let it try again) # Find tag on all files in release folder else: - for root, folders, names in scandir.walk(release_download['folder']): + for root, folders, names in scandir.walk(folder): tag_files.extend([sp(os.path.join(root, name)) for name in names if not os.path.splitext(name)[1] == '.ignore']) # Find all .ignore files in folder