monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-02 17:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change improve IPT and RarBG providers.

Browse source
This commit is contained in:
JackDandy 2018-06-01 15:55:33 +01:00
parent 70f1cc58ff
commit 5ae24235f5
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -1,4 +1,9 @@
### 0.16.13 (2018-05-26 17:00:00 UTC) ### 0.16.14 (2018-06-01 15:55:00 UTC)
* Change improve IPT and RarBG providers
### 0.16.13 (2018-05-26 17:00:00 UTC)
* Change add blacklog search terms for anime PROPERS * Change add blacklog search terms for anime PROPERS
* Fix rare case recovery after a server has been down * Fix rare case recovery after a server has been down

1
sickbeard/providers/generic.py
View file

@ -1474,6 +1474,7 @@ class TorrentProvider(GenericProvider):
return None return None
failure_count += self.failure_count failure_count += self.failure_count
self.failure_count = 0 self.failure_count = 0
cur_url = cur_url.replace('{ts}', '%s.' % str(time.time())[2:6])
if 10 < len(cur_url) and ((expire and (expire > int(time.time()))) or if 10 < len(cur_url) and ((expire and (expire > int(time.time()))) or
self._has_signature(self.get_url(cur_url, skip_auth=True))): self._has_signature(self.get_url(cur_url, skip_auth=True))):
for k, v in getattr(self, 'url_tmpl', {}).items(): for k, v in getattr(self, 'url_tmpl', {}).items():

8
sickbeard/providers/iptorrents.py
View file

@ -32,7 +32,7 @@ class IPTorrentsProvider(generic.TorrentProvider):
generic.TorrentProvider.__init__(self, 'IPTorrents') generic.TorrentProvider.__init__(self, 'IPTorrents')
self.url_home = (['https://iptorrents.%s/' % u for u in 'eu', 'com', 'me', 'ru'] + self.url_home = (['https://iptorrents.%s/' % u for u in 'eu', 'com', 'me', 'ru'] +
['http://rss.workisboring.com/', 'https://ipt-update.com'] + ['http://rss.workisboring.com/'] +
[base64.b64decode(x) for x in [''.join(x) for x in [ [base64.b64decode(x) for x in [''.join(x) for x in [
[re.sub('(?i)[q\s1]+', '', x[::-1]) for x in [ [re.sub('(?i)[q\s1]+', '', x[::-1]) for x in [
'c0RHa', 'vo1QD', 'hJ2L', 'GdhdXe', 'vdnLoN', 'J21cptmc', '5yZulmcv', '02bj', '=iq=']], 'c0RHa', 'vo1QD', 'hJ2L', 'GdhdXe', 'vdnLoN', 'J21cptmc', '5yZulmcv', '02bj', '=iq=']],
@ -44,8 +44,10 @@ class IPTorrentsProvider(generic.TorrentProvider):
'HGa', 'voDc0R', '21L', 'bucmbvt', 'ZyZWQ1L0Vm', 'ycrFW', '02bej5', 'e=gq']], 'HGa', 'voDc0R', '21L', 'bucmbvt', 'ZyZWQ1L0Vm', 'ycrFW', '02bej5', 'e=gq']],
[re.sub('(?i)[q\sei]+', '', x[::-1]) for x in [ [re.sub('(?i)[q\sei]+', '', x[::-1]) for x in [
'Q0RHa', 'voiQDc', 'asF2L', 'hVmLuVW', 'yZulGd', 'mbhdmcv1', 'Adl5mLjl', '==Qe']], 'Q0RHa', 'voiQDc', 'asF2L', 'hVmLuVW', 'yZulGd', 'mbhdmcv1', 'Adl5mLjl', '==Qe']],
[re.sub('(?i)[q\si1g]+', '', x[::-1]) for x in [ [re.sub('[r\sh]+', '', x[::-1]) for x in [
'Dc0GRHa', 'vo', 'Cdwl2L', 'FWZy5', 'bvJWL1k', '9mLzt2', 'wZy', '=GG=q']] 'fzRh3re', 'ChdwhlW', 'FW Zyh5', 'vJWhrLk', 'Lhz t2b', 'wZyhh9m', '=rr=']],
[re.sub('[S\sN]+', '', x[::-1]) for x in [
'zSSR3e', 'wNlWNf', 'zN 5Cd', '2SNJXZ', 'ySNAXZ', 'j5SSCc', '=S02 b']],
]]]) ]]])
self.url_vars = {'login': 't', 'search': 't?%s;q=%s;qf=ti%s%s#torrents'} self.url_vars = {'login': 't', 'search': 't?%s;q=%s;qf=ti%s%s#torrents'}

3
sickbeard/providers/rarbg.py
View file

@ -62,8 +62,9 @@ class RarbgProvider(generic.TorrentProvider):
if not self.should_skip() and response and 'token' in response: if not self.should_skip() and response and 'token' in response:
self.token = response['token'] self.token = response['token']
self.token_expiry = datetime.datetime.now() + datetime.timedelta(minutes=14) self.token_expiry = datetime.datetime.now() + datetime.timedelta(minutes=14)
time.sleep(2)
return True return True
time.sleep(1.1) time.sleep(2)
logger.log(u'No usable API token returned from: %s' % self.urls['api_token'], logger.ERROR) logger.log(u'No usable API token returned from: %s' % self.urls['api_token'], logger.ERROR)
return False return False