Merge branch 'refs/heads/develop' into desktop

couchpotato/core/_base/_core/main.py

@@ -10,7 +10,6 @@ from uuid import uuid4
 import os
 import platform
 import signal
-import sys
 import time
 import traceback
 import webbrowser
@@ -153,7 +152,7 @@ class Core(Plugin):
 
     def createBaseUrl(self):
         host = Env.setting('host')
-        if host == '0.0.0.0':
+        if host == '0.0.0.0' or host == '':
             host = 'localhost'
         port = Env.setting('port')
 
@@ -177,6 +176,7 @@ class Core(Plugin):
         })
 
     def signalHandler(self):
+        if Env.get('daemonized'): return
 
         def signal_handler(signal, frame):
             fireEvent('app.shutdown')

couchpotato/core/downloaders/base.py

@@ -57,6 +57,9 @@ class Downloader(Provider):
 
         return self.getAllDownloadStatus()
 
+    def getAllDownloadStatus(self):
+        return
+
     def _removeFailed(self, item):
         if self.isDisabled(manual = True, data = {}):
             return

couchpotato/core/downloaders/blackhole/main.py

@@ -60,5 +60,11 @@ class Blackhole(Downloader):
             return ['nzb']
 
     def isEnabled(self, manual, data = {}):
+        for_type = ['both']
+        if data and 'torrent' in data.get('type'):
+            for_type.append('torrent')
+        elif data:
+            for_type.append(data.get('type'))
+
         return super(Blackhole, self).isEnabled(manual, data) and \
-            ((self.conf('use_for') in ['both', 'torrent' if 'torrent' in data.get('type') else data.get('type')]))
+            ((self.conf('use_for') in for_type))

couchpotato/core/downloaders/nzbget/main.py

@@ -1,5 +1,6 @@
 from base64 import standard_b64encode
 from couchpotato.core.downloaders.base import Downloader
+from couchpotato.core.helpers.encoding import ss
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 import re
@@ -24,7 +25,7 @@ class NZBGet(Downloader):
         log.info('Sending "%s" to NZBGet.', data.get('name'))
 
         url = self.url % {'host': self.conf('host'), 'password': self.conf('password')}
-        nzb_name = '%s.nzb' % self.createNzbName(data, movie)
+        nzb_name = ss('%s.nzb' % self.createNzbName(data, movie))
 
         rpc = xmlrpclib.ServerProxy(url)
         try:

couchpotato/core/downloaders/transmission/main.py

@@ -38,6 +38,7 @@ class Transmission(Downloader):
             'download-dir': folder_path
         }
 
+        torrent_params = {}
         if self.conf('ratio'):
             torrent_params = {
                 'seedRatioLimit': self.conf('ratio'),
@@ -58,7 +59,8 @@ class Transmission(Downloader):
                 remote_torrent = trpc.add_torrent_file(b64encode(filedata), arguments = params)
 
             # Change settings of added torrents
-            trpc.set_torrent(remote_torrent['torrent-added']['hashString'], torrent_params)
+            if torrent_params:
+                trpc.set_torrent(remote_torrent['torrent-added']['hashString'], torrent_params)
 
             return True
         except Exception, err:

couchpotato/core/plugins/manage/main.py

@@ -198,7 +198,7 @@ class Manage(Plugin):
 
     def directories(self):
         try:
-            if self.conf('library', '').strip():
+            if self.conf('library', default = '').strip():
                 return splitString(self.conf('library', default = ''), '::')
         except:
             pass

couchpotato/core/plugins/quality/main.py

@@ -21,7 +21,7 @@ class QualityPlugin(Plugin):
         {'identifier': 'bd50', 'hd': True, 'size': (15000, 60000), 'label': 'BR-Disk', 'alternative': ['bd25'], 'allow': ['1080p'], 'ext':[], 'tags': ['bdmv', 'certificate', ('complete', 'bluray')]},
         {'identifier': '1080p', 'hd': True, 'size': (5000, 20000), 'label': '1080P', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts'], 'tags': ['m2ts']},
         {'identifier': '720p', 'hd': True, 'size': (3500, 10000), 'label': '720P', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts']},
-        {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p'], 'ext':['avi']},
+        {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p', '1080p'], 'ext':['avi']},
         {'identifier': 'dvdr', 'size': (3000, 10000), 'label': 'DVD-R', 'alternative': [], 'allow': [], 'ext':['iso', 'img'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts']},
         {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': ['dvdrip'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]},
         {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']},

couchpotato/runner.py

@@ -118,6 +118,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
     Env.set('console_log', options.console_log)
     Env.set('quiet', options.quiet)
     Env.set('desktop', desktop)
+    Env.set('daemonized', options.daemon)
     Env.set('args', args)
     Env.set('options', options)
 
@@ -259,7 +260,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
 
     while try_restart:
         try:
-            server.listen(config['port'])
+            server.listen(config['port'], config['host'])
             loop.start()
         except Exception, e:
             try: