Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop

couchpotato/core/downloaders/sabnzbd/main.py

@@ -90,9 +90,14 @@ class Sabnzbd(Downloader):
 
         # Get busy releases
         for item in queue.get('slots', []):
+            status = 'busy'
+            if 'ENCRYPTED / ' in item['filename']:
+                status = 'failed'
+
             statuses.append({
                 'id': item['nzo_id'],
                 'name': item['filename'],
+                'status': status,
                 'original_status': item['status'],
                 'timeleft': item['timeleft'] if not queue['paused'] else -1,
             })
@@ -122,6 +127,12 @@ class Sabnzbd(Downloader):
         log.info('%s failed downloading, deleting...', item['name'])
 
         try:
+            self.call({
+                'mode': 'queue',
+                'name': 'delete',
+                'del_files': '1',
+                'value': item['id']
+            }, use_json = False)
             self.call({
                 'mode': 'history',
                 'name': 'delete',

couchpotato/core/plugins/renamer/main.py

@@ -706,7 +706,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
                                 elif item['status'] == 'seeding':
 
                                     #If linking setting is enabled, process release
-                                    if self.conf('file_action') != 'move' and not rel.movie.status_id == done_status.get('id') and self.statusInfoComplete(item):
+                                    if self.conf('file_action') != 'move' and not rel.status_id == seeding_status.get('id') and self.statusInfoComplete(item):
                                         log.info('Download of %s completed! It is now being processed while leaving the original files alone for seeding. Current ratio: %s.', (item['name'], item['seed_ratio']))
 
                                         # Remove the downloading tag