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

Merge branch 'hotfix/0.12.13'

Browse source
This commit is contained in:
JackDandy 2017-04-24 18:52:16 +01:00
commit 6fdc11f881
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGES.md
View file

@ -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)

6
sickbeard/providers/speedcd.py
View file

@ -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()

7
sickbeard/webserve.py
View file

@ -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 = {}