Revert "Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv"

This reverts commit b8bce948c8, reversing
changes made to 0a996857dd.

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

@@ -18,12 +18,6 @@ config = [{
                     'type': 'enabler',
                     'default': 0
                 },
-                {
-                    'name': 'domain',
-                    'advanced': True,
-                    'label': 'Proxy server',
-                    'description': 'Domain for requests, keep empty to let CouchPotato pick.',
-                },
                 {
                     'name': 'seed_ratio',
                     'label': 'Seed ratio',

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

@@ -1,8 +1,8 @@
 from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentMagnetProvider
 from couchpotato.core.providers.base import MultiProvider
 from couchpotato.core.providers.info.base import MovieProvider
+from couchpotato.core.providers.torrent.base import TorrentProvider
 import traceback
 
 log = CPLog(__name__)
@@ -12,22 +12,15 @@ class Yify(MultiProvider):
     def getTypes(self):
         return [Movie]
 
-class Base(TorrentMagnetProvider):
+class Base(TorrentProvider):
 
     urls = {
-        'test' : '%s/api',
-        'search' : '%s/api/list.json?keywords=%s&quality=%s',
-        'detail': '%s/api/movie.json?id=%s'
+        'test' : 'https://yify-torrents.com/api',
+        'search' : 'https://yify-torrents.com/api/list.json?keywords=%s&quality=%s',
+        'detail': 'https://yify-torrents.com/api/movie.json?id=%s'
     }
 
     http_time_between_calls = 1 #seconds
-    
-    proxy_list = [
-        'https://yify-torrents.im',
-        'http://yify.unlocktorrent.com',
-        'http://yify.ftwnet.co.uk',
-        'http://yify-torrents.com.come.in',
-    ]
 
     def search(self, movie, quality):
 
@@ -38,9 +31,7 @@ class Base(TorrentMagnetProvider):
 
     def _search(self, movie, quality, results):
 
-        search_url = self.urls['search'] % (self.getDomain(), movie['library']['identifier'], quality['identifier'])
-
-        data = self.getJsonData(search_url)
+        data = self.getJsonData(self.urls['search'] % (movie['library']['identifier'], quality['identifier']))
 
         if data and data.get('MovieList'):
             try:
@@ -56,8 +47,8 @@ class Base(TorrentMagnetProvider):
                     results.append({
                         'id': result['MovieID'],
                         'name': title,
-                        'url': result['TorrentMagnetUrl'],
-                        'detail_url': self.urls['detail'] % (self.getDomain(),result['MovieID']),
+                        'url': result['TorrentUrl'],
+                        'detail_url': self.urls['detail'] % result['MovieID'],
                         'size': self.parseSize(result['Size']),
                         'seeders': tryInt(result['TorrentSeeds']),
                         'leechers': tryInt(result['TorrentPeers'])
@@ -66,8 +57,5 @@ class Base(TorrentMagnetProvider):
             except:
                 log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
 
-    def correctProxy(self, data):
-        return 'title="YIFY-Torrents RSS feed"' in data
-
 class Movie(MovieProvider, Base):
     pass