monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #744 from JackDandy/feature/ChangeProviders

Browse source 
Change increase delay between requests to nnab servers to over 2 seco…
This commit is contained in:
JackDandy 2016-07-25 19:06:18 +01:00 committed by GitHub
commit 6a6fd914b6
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -107,6 +107,9 @@
* Change include x265 category when searching IPT provider * Change include x265 category when searching IPT provider
* Change init.systemd to use python2 binary and recommended installation paths * 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 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] [develop changelog]
* Change send nzb data to NZBGet for Anizb instead of url * Change send nzb data to NZBGet for Anizb instead of url

6
sickbeard/providers/generic.py
View file

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

3
sickbeard/providers/iptorrents.py
View file

@ -29,7 +29,8 @@ class IPTorrentsProvider(generic.TorrentProvider):
def __init__(self): def __init__(self):
generic.TorrentProvider.__init__(self, 'IPTorrents') 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_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', self.url_tmpl = {'config_provider_home_uri': '%(home)s', 'login': '%(home)s%(vars)s',

2
sickbeard/providers/newznab.py
View file

@ -285,7 +285,7 @@ class NewznabProvider(generic.NZBProvider):
cnt = len(results) cnt = len(results)
data = self.cache.getRSSFeed('%sapi' % self.url, params=request_params) 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): if not data or not self.check_auth_from_data(data):
break break