From 8e9ec6c3340b919cb6650381781d5ab91a82e583 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Mon, 24 Apr 2017 18:51:35 +0100 Subject: [PATCH] Change add filter for thetvdb show overview and remove SpeedCD 'inspeed_uid' cookie requirement. --- CHANGES.md | 10 ++++++++-- sickbeard/providers/speedcd.py | 6 +++--- sickbeard/webserve.py | 7 +++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 30906938..726af412 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,12 @@ -### 0.12.12 (2017-03-30 03:15:00 UTC) +### 0.12.13 (2017-04-23 18:50:00 UTC) -* Change search of SpeedCD, TVChaos and parse of TorrentDay. +* Change add filter for thetvdb show overview +* Change remove SpeedCD 'inspeed_uid' cookie requirement + + +### 0.12.12 (2017-03-30 03:15:00 UTC) + +* Change search of SpeedCD, TVChaos and parse of TorrentDay ### 0.12.11 (2017-03-17 02:00:00 UTC) diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py index af02f9f3..55e59670 100644 --- a/sickbeard/providers/speedcd.py +++ b/sickbeard/providers/speedcd.py @@ -45,8 +45,8 @@ class SpeedCDProvider(generic.TorrentProvider): return super(SpeedCDProvider, self)._authorised( logged_in=(lambda y='': all( - ['RSS' in y, 'type="password"' not in y, self.has_all_cookies(['uid', 'speedian'], 'inSpeed_')] + - [(self.session.cookies.get('inSpeed_' + x) or 'sg!no!pw') in self.digest for x in 'uid', 'speedian'])), + ['RSS' in y, 'type="password"' not in y, self.has_all_cookies(['speedian'], 'inSpeed_')] + + [(self.session.cookies.get('inSpeed_' + x) or 'sg!no!pw') in self.digest for x in ['speedian']])), failed_msg=(lambda y=None: u'Invalid cookie details for %s. Check settings')) def _search_provider(self, search_params, **kwargs): @@ -120,7 +120,7 @@ class SpeedCDProvider(generic.TorrentProvider): @staticmethod def ui_string(key): - return 'speedcd_digest' == key and 'use... \'inSpeed_uid=xx; inSpeed_speedian=yy\'' or '' + return 'speedcd_digest' == key and 'use... \'inSpeed_speedian=yy\'' or '' provider = SpeedCDProvider() diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index f313b1f3..cf9aff6f 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1341,6 +1341,13 @@ class Home(MainHandler): {'title': 'Download Subtitles', 'path': 'home/subtitleShow?show=%d' % showObj.indexerid}) t.show = showObj + with BS4Parser('%s' % showObj.overview, features=['html5lib', 'permissive']) as soup: + try: + soup.a.replace_with(soup.new_tag('')) + except(StandardError, Exception): + pass + overview = re.sub('(?i)full streaming', '', soup.get_text().strip()) + t.show.overview = overview t.show_message = show_message ep_counts = {}