Move Yify to v2

couchpotato/core/media/_base/providers/torrent/yify.py

@@ -2,27 +2,25 @@ import traceback
 
 from couchpotato.core.helpers.variable import tryInt, getIdentifier
 from couchpotato.core.logger import CPLog
-from couchpotato.core.media._base.providers.torrent.base import TorrentMagnetProvider
+from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
 
 
 log = CPLog(__name__)
 
 
-class Base(TorrentMagnetProvider):
+class Base(TorrentProvider):
 
     urls = {
-        'test': '%s/api',
+        'test': '%s/api/v2',
-        'search': '%s/api/list.json?keywords=%s',
+        'search': '%s/api/v2/list_movies.json?limit=50&query_term=%s'
-        'detail': '%s/api/movie.json?id=%s'
     }
 
     http_time_between_calls = 1  # seconds
 
     proxy_list = [
         'https://yts.re',
-        'http://ytsproxy.come.in',
+        'https://yts.wf',
         'http://yts.im',
-        'http://yify-torrents.im',
     ]
 
     def search(self, movie, quality):
@@ -41,24 +39,27 @@ class Base(TorrentMagnetProvider):
         search_url = self.urls['search'] % (domain, getIdentifier(movie))
 
         data = self.getJsonData(search_url)
+        data = data.get('data')
 
-        if data and data.get('MovieList'):
+        if data and data.get('movies'):
             try:
-                for result in data.get('MovieList'):
+                for result in data.get('movies'):
 
-                    if result['Quality'] and result['Quality'] not in result['MovieTitle']:
+                    for release in result.get('torrents', []):
-                        title = result['MovieTitle'] + ' BrRip ' + result['Quality']
+
+                        if release['quality'] and release['quality'] not in result['title_long']:
+                            title = result['title_long'] + ' BRRip ' + release['quality']
                         else:
-                        title = result['MovieTitle'] + ' BrRip'
+                            title = result['title_long'] + ' BRRip'
 
                         results.append({
-                        'id': result['MovieID'],
+                            'id': release['hash'],
                             'name': title,
-                        'url': result['TorrentMagnetUrl'],
+                            'url': release['url'],
-                        'detail_url': self.urls['detail'] % (domain, result['MovieID']),
+                            'detail_url': result['url'],
-                        'size': self.parseSize(result['Size']),
+                            'size': self.parseSize(release['size']),
-                        'seeders': tryInt(result['TorrentSeeds']),
+                            'seeders': tryInt(release['seeds']),
-                        'leechers': tryInt(result['TorrentPeers']),
+                            'leechers': tryInt(release['peers']),
                         })
 
             except: