Merge branch 'develop' of https://github.com/clinton-hall/CouchPotatoServer into clinton-hall-develop

couchpotato/core/plugins/renamer/main.py

@@ -506,9 +506,11 @@ class Renamer(Plugin):
 
         if rels:
             log.debug('Checking status snatched releases...')
+            # get queue and history (once) from SABnzbd
+            queue, history = fireEvent('download.status', data = {}, movie = {}, single = True)
 
         scan_required = False
-
+        
         for rel in rels:
 
             # Get current selected title
@@ -530,7 +532,29 @@ class Renamer(Plugin):
             movie_dict = fireEvent('movie.get', rel.movie_id, single = True)
 
             # check status
-            downloadstatus = fireEvent('download.status', data = item, movie = movie_dict, single = True)
+            nzbname = self.createNzbName(item, movie_dict)
+            try:
+                for slot in queue['queue']['slots']:
+                    log.debug('Found %s in SabNZBd queue, which is %s, with %s left', (slot['filename'], slot['status'], slot['timeleft']))
+                    if slot['filename'] == nzbname:
+                        downloadstatus =['status'].lower()
+            except:
+                log.debug('No items in queue: %s', (traceback.format_exc()))
+            try:
+                for slot in history['history']['slots']:
+                    log.debug('Found %s in SabNZBd history, which has %s', (slot['name'], slot['status']))
+                    if slot['name'] == nzbname:
+                        # Note: if post process even if failed is on in SabNZBd, it will complete with a fail message
+                        if slot['status'] == 'Failed' or (slot['status'] == 'Completed' and slot['fail_message'].strip()):
+
+                            # Delete failed download
+                            rel_remove = fireEvent('download.remove', name = slot['name'], nzo_id = slot['nzo_id'], single = True)
+                            downloadstatus = 'failed'
+                        else:
+                            downloadstatus = slot['status'].lower()
+            except:
+                log.debug('No items in history: %s', (traceback.format_exc()))
+
             if not downloadstatus:
                 log.debug('Download status functionality is not implemented for active downloaders.')
                 scan_required = True