Merge branch 'refs/heads/develop'

couchpotato/core/downloaders/nzbvortex/__init__.py

@@ -34,6 +34,12 @@ config = [{
                     'advanced': True,
                     'description': 'Disable this downloader for automated searches, but use it when I manually send a release.',
                 },
+                {
+                    'name': 'delete_failed',
+                    'default': True,
+                    'type': 'bool',
+                    'description': 'Delete a release after the download has failed.',
+                },
             ],
         }
     ],

couchpotato/core/downloaders/nzbvortex/main.py

@@ -39,7 +39,7 @@ class NZBVortex(Downloader):
 
     def getAllDownloadStatus(self):
 
-        if self.isDisabled(manual = False):
+        if self.isDisabled(manual = True):
             return False
 
         raw_statuses = self.call('nzb')
@@ -64,6 +64,21 @@ class NZBVortex(Downloader):
 
         return statuses
 
+    def removeFailed(self, item):
+
+        if not self.conf('delete_failed', default = True):
+            return False
+
+        log.info('%s failed downloading, deleting...', item['name'])
+
+        try:
+            self.call('nzb/%s/cancel' % item['id'])
+        except:
+            log.error('Failed deleting: %s', traceback.format_exc(0))
+            return False
+
+        return True
+
     def login(self):
 
         nonce = self.call('auth/nonce', auth = False).get('authNonce')

couchpotato/core/downloaders/sabnzbd/main.py

@@ -65,7 +65,7 @@ class Sabnzbd(Downloader):
             return False
 
     def getAllDownloadStatus(self):
-        if self.isDisabled(manual = False):
+        if self.isDisabled(manual = True):
             return False
 
         log.debug('Checking SABnzbd download status.')

couchpotato/core/plugins/renamer/main.py

@@ -33,6 +33,7 @@ class Renamer(Plugin):
         addEvent('renamer.check_snatched', self.checkSnatched)
 
         addEvent('app.load', self.scan)
+        addEvent('app.load', self.checkSnatched)
 
         if self.conf('run_every') > 0:
             fireEvent('schedule.interval', 'renamer.check_snatched', self.checkSnatched, minutes = self.conf('run_every'))