From 5ae24235f5eadd5a9304eb2b7bba52e1089cf4ba Mon Sep 17 00:00:00 2001 From: JackDandy Date: Fri, 1 Jun 2018 15:55:33 +0100 Subject: [PATCH] Change improve IPT and RarBG providers. --- CHANGES.md | 7 ++++++- sickbeard/providers/generic.py | 1 + sickbeard/providers/iptorrents.py | 8 +++++--- sickbeard/providers/rarbg.py | 3 ++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4ef1c9c9..7662551c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 * Fix rare case recovery after a server has been down diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 3014d74c..e7445a3a 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -1474,6 +1474,7 @@ class TorrentProvider(GenericProvider): return None failure_count += self.failure_count 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 self._has_signature(self.get_url(cur_url, skip_auth=True))): for k, v in getattr(self, 'url_tmpl', {}).items(): diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py index e5c9048d..2cdf4785 100644 --- a/sickbeard/providers/iptorrents.py +++ b/sickbeard/providers/iptorrents.py @@ -32,7 +32,7 @@ class IPTorrentsProvider(generic.TorrentProvider): generic.TorrentProvider.__init__(self, 'IPTorrents') 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 [ [re.sub('(?i)[q\s1]+', '', x[::-1]) for x in [ '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']], [re.sub('(?i)[q\sei]+', '', x[::-1]) for x in [ 'Q0RHa', 'voiQDc', 'asF2L', 'hVmLuVW', 'yZulGd', 'mbhdmcv1', 'Adl5mLjl', '==Qe']], - [re.sub('(?i)[q\si1g]+', '', x[::-1]) for x in [ - 'Dc0GRHa', 'vo', 'Cdwl2L', 'FWZy5', 'bvJWL1k', '9mLzt2', 'wZy', '=GG=q']] + [re.sub('[r\sh]+', '', x[::-1]) for x in [ + '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'} diff --git a/sickbeard/providers/rarbg.py b/sickbeard/providers/rarbg.py index 41464507..c6b184b6 100644 --- a/sickbeard/providers/rarbg.py +++ b/sickbeard/providers/rarbg.py @@ -62,8 +62,9 @@ class RarbgProvider(generic.TorrentProvider): if not self.should_skip() and response and 'token' in response: self.token = response['token'] self.token_expiry = datetime.datetime.now() + datetime.timedelta(minutes=14) + time.sleep(2) 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) return False