Merge branch 'refs/heads/develop' into nosql

Conflicts:
	couchpotato/core/providers/torrent/sceneaccess/main.py

couchpotato/core/downloaders/rtorrent/__init__.py

@@ -31,8 +31,8 @@ config = [{
                 {
                     'name': 'host',
                     'default': 'localhost:80',
-                    'description': 'Hostname with port or XML-RPC Endpoint URI. Usually <strong>scgi://localhost:5000</strong> '
-                                   'or <strong>localhost:80</strong>'
+                    'description': 'RPC Communication URI. Usually <strong>scgi://localhost:5000</strong>, '
+                                   '<strong>httprpc://localhost/rutorrent</strong> or <strong>localhost:80</strong>'
                 },
                 {
                     'name': 'ssl',
@@ -46,7 +46,7 @@ config = [{
                     'type': 'string',
                     'default': 'RPC2',
                     'advanced': True,
-                    'description': 'Change if you don\'t run rTorrent RPC at the default url.',
+                    'description': 'Change if your RPC mount is at a different path.',
                 },
                 {
                     'name': 'username',

couchpotato/core/downloaders/rtorrent/main.py

@@ -1,14 +1,15 @@
-from base64 import b16encode, b32decode
-from bencode import bencode, bdecode
 from couchpotato.core.downloaders.base import Downloader, ReleaseDownloadList
 from couchpotato.core.event import fireEvent, addEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import cleanHost, splitString
 from couchpotato.core.logger import CPLog
+from base64 import b16encode, b32decode
+from bencode import bencode, bdecode
 from datetime import timedelta
 from hashlib import sha1
 from rtorrent import RTorrent
 from rtorrent.err import MethodError
+from urlparse import urlparse
 import os
 from scandir import scandir
 
@@ -52,7 +53,12 @@ class rTorrent(Downloader):
         if self.rt is not None:
             return self.rt
 
-        url = cleanHost(self.conf('host'), protocol = True, ssl = self.conf('ssl')) + self.conf('rpc_url')
+        url = cleanHost(self.conf('host'), protocol = True, ssl = self.conf('ssl'))
+        parsed = urlparse(url)
+
+        # rpc_url is only used on http/https scgi pass-through
+        if parsed.scheme in ['http', 'https']:
+            url += self.conf('rpc_url')
 
         if self.conf('username') and self.conf('password'):
             self.rt = RTorrent(
@@ -169,6 +175,21 @@ class rTorrent(Downloader):
             log.error('Failed to send torrent to rTorrent: %s', err)
             return False
 
+    def getTorrentStatus(self, torrent):
+        if torrent.hashing or torrent.hash_checking or torrent.message:
+            return 'busy'
+
+        if not torrent.complete:
+            return 'busy'
+
+        if not torrent.open:
+            return 'completed'
+
+        if torrent.state and torrent.active:
+            return 'seeding'
+
+        return 'busy'
+
     def getAllDownloadStatus(self, ids):
         log.debug('Checking rTorrent download status.')
 
@@ -193,17 +214,10 @@ class rTorrent(Downloader):
 
                         torrent_files.append(sp(file_path))
 
-                    status = 'busy'
-                    if torrent.complete:
-                        if torrent.active:
-                            status = 'seeding'
-                        else:
-                            status = 'completed'
-
                     release_downloads.append({
                         'id': torrent.info_hash,
                         'name': torrent.name,
-                        'status': status,
+                        'status': self.getTorrentStatus(torrent),
                         'seed_ratio': torrent.ratio,
                         'original_status': torrent.state,
                         'timeleft': str(timedelta(seconds = float(torrent.left_bytes) / torrent.down_rate)) if torrent.down_rate > 0 else -1,

couchpotato/core/notifications/pushbullet/main.py

@@ -1,5 +1,5 @@
 from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 import base64
@@ -32,7 +32,7 @@ class Pushbullet(Notification):
             response = self.request(
                 'pushes',
                 cache = False,
-                device_id = device,
+                device_iden = device,
                 type = 'note',
                 title = self.default_title,
                 body = toUnicode(message)
@@ -46,24 +46,7 @@ class Pushbullet(Notification):
         return successful == len(devices)
 
     def getDevices(self):
-        devices = [d.strip() for d in self.conf('devices').split(',')]
-
-        # Remove empty items
-        devices = [d for d in devices if len(d)]
-
-        # Break on any ids that aren't integers
-        valid_devices = []
-
-        for device_id in devices:
-            d = tryInt(device_id, None)
-
-            if not d:
-                log.error('Device ID "%s" is not valid', device_id)
-                return None
-
-            valid_devices.append(d)
-
-        return valid_devices
+        return splitString(self.conf('devices'))
 
     def request(self, method, cache = True, **kwargs):
         try:

couchpotato/core/providers/torrent/passthepopcorn/main.py

@@ -89,11 +89,11 @@ class PassThePopcorn(TorrentProvider):
                     if 'GoldenPopcorn' in torrent and torrent['GoldenPopcorn']:
                         torrentdesc += ' HQ'
                         if self.conf('prefer_golden'):
-                            torrentscore += 200
+                            torrentscore += 5000
                     if 'Scene' in torrent and torrent['Scene']:
                         torrentdesc += ' Scene'
                         if self.conf('prefer_scene'):
-                            torrentscore += 50
+                            torrentscore += 2000
                     if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
                         torrentdesc += self.htmlToASCII(' %s' % torrent['RemasterTitle'])
 

couchpotato/core/providers/torrent/sceneaccess/main.py

@@ -40,7 +40,7 @@ class SceneAccess(TorrentProvider):
 
         arguments = tryUrlencode({
             'search': movie['identifier'],
-            'method': 1,
+            'method': 3,
         })
         url = "%s&%s" % (url, arguments)
 

couchpotato/core/providers/torrent/yify/main.py

@@ -18,9 +18,9 @@ class Yify(TorrentMagnetProvider):
 
     proxy_list = [
         'http://yify.unlocktorrent.com',
-        'http://yify.ftwnet.co.uk',
         'http://yify-torrents.com.come.in',
         'http://yts.re',
+        'http://yts.im'
         'https://yify-torrents.im',
     ]