Merge pull request #744 from JackDandy/feature/ChangeProviders

Change increase delay between requests to nnab servers to over 2 seco…

CHANGES.md

@@ -107,6 +107,9 @@
 * Change include x265 category when searching IPT provider
 * Change init.systemd to use python2 binary and recommended installation paths
 * Change improve handling of SIGINT CTRL+C, SIGINT CTRL+BREAK(Windows) and SIGTERM
+* Change add three IPTorrents fallback urls
+* Change remove one dead and add three fallback magnet torcaches for blackhole use
+* Change increase delay between requests to nnab servers to over 2 seconds
 
 [develop changelog]
 * Change send nzb data to NZBGet for Anizb instead of url

sickbeard/providers/generic.py

@@ -173,9 +173,9 @@ class GenericProvider:
                     logger.log('Unable to extract torrent hash from link: ' + ex(result.url), logger.ERROR)
                     return False
 
-                urls = ['http%s://%s/%s.torrent' % (u + (torrent_hash,))
-                        for u in (('s', 'torcache.net/torrent'), ('', 'thetorrent.org/torrent'),
-                                  ('s', 'itorrents.org/torrent'))]
+                urls = ['http%s://%s/torrent/%s.torrent' % (u + (torrent_hash,))
+                        for u in (('s', 'itorrents.org'), ('s', 'torra.pro'), ('s', 'torra.click'),
+                                  ('s', 'torrentproject.se'), ('', 'thetorrent.org'))]
             except:
                 link_type = 'torrent'
                 urls = [result.url]

sickbeard/providers/iptorrents.py

@@ -29,7 +29,8 @@ class IPTorrentsProvider(generic.TorrentProvider):
     def __init__(self):
         generic.TorrentProvider.__init__(self, 'IPTorrents')
 
-        self.url_home = ['https://iptorrents.%s/' % u for u in 'eu', 'com', 'ru']
+        self.url_home = (['https://iptorrents.%s/' % u for u in 'eu', 'com', 'me', 'ru'] +
+                         ['https://mysite.access.ly/', 'https://pcgame.servegame.com/'])
 
         self.url_vars = {'login': 'getrss.php', 'search': 't?%s;q=%s;qf=ti%s%s#torrents', 'get': '%s'}
         self.url_tmpl = {'config_provider_home_uri': '%(home)s', 'login': '%(home)s%(vars)s',

sickbeard/providers/newznab.py

@@ -285,7 +285,7 @@ class NewznabProvider(generic.NZBProvider):
                     cnt = len(results)
 
                     data = self.cache.getRSSFeed('%sapi' % self.url, params=request_params)
-                    i and time.sleep(1.1)
+                    i and time.sleep(2.1)
 
                     if not data or not self.check_auth_from_data(data):
                         break