Blackhole support for rarred and empty (faulty) nzbs.

.gitignore

@@ -2,4 +2,3 @@
 /logs/*.log
 /_source/
 /_data/
-*.pyc

couchpotato/core/downloaders/base.py

@@ -16,6 +16,9 @@ class Downloader(Plugin):
     def download(self, data = {}):
         pass
 
+    def createFileExtension(self, data = {}, content):
+        pass
+
     def cpTag(self, movie):
         if Env.setting('enabled', 'renamer'):
             return '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''

couchpotato/core/downloaders/blackhole/main.py

@@ -10,6 +10,12 @@ class Blackhole(Downloader):
 
     type = ['nzb', 'torrent']
 
+    def createFileExtension(self, data = {}, content):
+        if "DOCTYPE nzb" not in content:
+           if data.get('type') == 'nzb':
+             return 'rar'
+        return data.get('type')
+
     def download(self, data = {}, movie = {}):
 
         if self.isDisabled() or not self.isCorrectType(data.get('type') or not self.conf('use_for') in ['both', data.get('type')]):
@@ -20,14 +26,20 @@ class Blackhole(Downloader):
         if not directory or not os.path.isdir(directory):
             log.error('No directory set for blackhole %s download.' % data.get('type'))
         else:
-            fullPath = os.path.join(directory, '%s%s.%s' % (toSafeString(data.get('name')), self.cpTag(movie) , data.get('type')))
+                    try:
+                        file = data.get('download')(url = data.get('url'), nzb_id = data.get('id'))
+                        if "no nzb" in file:
+                            log.error('No nzb available!')
+
+                        fileExtension = createFileExtension(data, file)
+                        fullPath = os.path.join(directory, '%s%s.%s' % (toSafeString(data.get('name')), self.cpTag(movie) , fileExtension)
                         
                         try:
                            if not os.path.isfile(fullPath):
                                log.info('Downloading %s to %s.' % (data.get('type'), fullPath))
-
-                    try:
-                        file = data.get('download')(url = data.get('url'), nzb_id = data.get('id'))
+                        except:
+                               log.error('Failed to download to blackhole %s' % traceback.format_exc())
+                               pass
 
                         with open(fullPath, 'wb') as f:
                             f.write(file)
@@ -39,8 +51,4 @@ class Blackhole(Downloader):
                 else:
                     log.info('File %s already exists.' % fullPath)
                     return True
-            except:
-                log.error('Failed to download to blackhole %s' % traceback.format_exc())
-                pass
-
         return False