Merge branch 'master' into develop

8 years ago · 44c44d9351
3 changed files with 17 additions and 4 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -60,9 +60,15 @@
 * Change restart/shutdown to use updated jQuery


+### 0.12.13 (2017-04-23 18:50:00 UTC)
+
+* 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.
+* Change search of SpeedCD, TVChaos and parse of TorrentDay


 ### 0.12.11 (2017-03-17 02:00:00 UTC)
--- 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()
--- 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('<html><body>%s</body></html>' % 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 = {}