Merge branch 'hdbits-api' of git://github.com/georgewhewell/CouchPotatoServer into georgewhewell-hdbits-api

couchpotato/core/providers/torrent/hdbits/__init__.py

@@ -23,11 +23,6 @@ config = [{
                     'default': '',
                 },
                 {
-                    'name': 'password',
-                    'default': '',
-                    'type': 'password',
-                },
-                {
                     'name': 'passkey',
                     'default': '',
                 },

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

@@ -1,7 +1,10 @@
-from bs4 import BeautifulSoup
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.torrent.base import TorrentProvider
+
+import re
+import json
+import requests
 import traceback
 
 log = CPLog(__name__)
@@ -10,50 +13,62 @@ log = CPLog(__name__)
 class HDBits(TorrentProvider):
 
     urls = {
-        'test': 'https://hdbits.org/',
+        'test' : 'https://hdbits.org/',
-        'login': 'https://hdbits.org/login/doLogin/',
+        'detail' : 'https://hdbits.org/details.php?id=%s',
-        'detail': 'https://hdbits.org/details.php?id=%s&source=browse',
+        'download' : 'https://hdbits.org/download.php?id=%s&passkey=%s',
-        'search': 'https://hdbits.org/json_search.php?imdb=%s',
+        'api': 'https://hdbits.org/api/torrents'
-        'download': 'https://hdbits.org/download.php/%s.torrent?id=%s&passkey=%s&source=details.browse',
+    }
-        'login_check': 'http://hdbits.org/inbox.php',
+
+    status_codes = {
+        1: 'Failure (something bad happened)',
+        2: 'SSL Required - You should be on https://',
+        3: 'JSON Malformed',
+        4: 'Auth data missing',
+        5: 'Auth failed'
     }
 
     http_time_between_calls = 1 #seconds
 
+    def _post_query(self, **params):
+
+        post_data = {
+            'username': self.conf('username'),
+            'passkey': self.conf('passkey')
+        }
+        post_data.update(params)
+
+        req = requests.post(self.urls['api'],
+            data=json.dumps(post_data))
+
+        response = json.loads(req.text)
+
+        if response['status'] != 0:
+            log.error('Error searching hdbits: %s'
+                % self.status_codes[response['status']])
+        else:
+            return response['data']
+
     def _search(self, movie, quality, results):
 
-        data = self.getJsonData(self.urls['search'] % movie['library']['identifier'])
+        match = re.match(r'tt(\d{7})',
+            movie['library']['identifier'])
+
+        data = self._post_query(imdb={'id': match.group(1)})
 
         if data:
             try:
                 for result in data:
                     results.append({
                         'id': result['id'],
-                        'name': result['title'],
+                        'name': result['name'],
-                        'url': self.urls['download'] % (result['id'], result['id'], self.conf('passkey')),
+                        'url': self.urls['download']
+                            % (result['id'], self.conf('passkey')),
                         'detail_url': self.urls['detail'] % result['id'],
                         'size': self.parseSize(result['size']),
-                        'seeders': tryInt(result['seeder']),
+                        'seeders': tryInt(result['seeders']),
-                        'leechers': tryInt(result['leecher'])
+                        'leechers': tryInt(result['leechers'])
                     })
-
             except:
-                log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
+                log.error('Failed getting results from %s: %s',
-
+                    (self.getName(), traceback.format_exc()))
-    def getLoginParams(self):
-        data = self.getHTMLData('https://hdbits.org/login', cache_timeout = 0)
-
-        bs = BeautifulSoup(data)
-        secret = bs.find('input', attrs = {'name': 'lol'})['value']
-
-        return {
-            'uname': self.conf('username'),
-            'password': self.conf('password'),
-            'returnto': '/',
-            'lol': secret
-        }
-
-    def loginSuccess(self, output):
-        return '/logout.php' in output.lower()
 
-    loginCheckSuccess = loginSuccess