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

Merge pull request #3070 from mano3m/develop_fix_ignore

Browse Source 
Check if folder exists in tagging
This commit is contained in:
Ruud Burger
2014-04-04 14:59:33 +02:00
parent 9540ae5a19 8f4219a93c
commit 6d98f67668
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
couchpotato/core/plugins/renamer.py
View File

@@ -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