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

Merge pull request #132 from Prinz23/feature/FixAddFromTrendingShowPage

Browse source
This commit is contained in:
JackDandy 2014-12-31 18:10:10 +00:00
commit 8ab21cf76b
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -11,6 +11,7 @@
* Change ThePirateBay to use oldpiratebay as a temporary fix * Change ThePirateBay to use oldpiratebay as a temporary fix
* Change Search Settings/Torrent/Deluge option texts for improved understanding * Change Search Settings/Torrent/Deluge option texts for improved understanding
* Fix Womble's Index searching (ssl disabled for now, old categories are the new active ones again) * Fix Womble's Index searching (ssl disabled for now, old categories are the new active ones again)
* Fix Add From Trending Show page to work with Trakt changes
[develop changelog] [develop changelog]

2
gui/slick/interfaces/default/home_trendingShows.tmpl
View file

@ -129,7 +129,7 @@
#else #else
#for $cur_show in $trending_shows: #for $cur_show in $trending_shows:
#set $image = re.sub(r'(.*)(\..*?)$', r'\1-300\2', $cur_show['images']['poster'], 0, re.IGNORECASE | re.MULTILINE) #set $image = re.sub(r'(.*)/original/(.+)$', r'\1/thumb/\2', $cur_show['images']['poster'], 0, re.IGNORECASE | re.MULTILINE)
<div class="trakt_show <%= ('notinlibrary', 'inlibrary')[':' in cur_show['show_id']] %>" data-name="$cur_show['title']" data-rating="$cur_show['ratings']['percentage']" data-votes="$cur_show['ratings']['votes']"> <div class="trakt_show <%= ('notinlibrary', 'inlibrary')[':' in cur_show['show_id']] %>" data-name="$cur_show['title']" data-rating="$cur_show['ratings']['percentage']" data-votes="$cur_show['ratings']['votes']">
<div class="traktContainer"> <div class="traktContainer">

2
sickbeard/webserve.py
View file

@ -2980,7 +2980,7 @@ class NewHomeAddShows(MainHandler):
tvdbs = ['tvdb_id', 'tvrage_id'] tvdbs = ['tvdb_id', 'tvrage_id']
for index, tvdb in enumerate(tvdbs): for index, tvdb in enumerate(tvdbs):
try: try:
item[u'show_id'] = item[tvdb] item[u'show_id'] = str(item[tvdb])
tvshow = helpers.findCertainShow(sickbeard.showList, int(item[tvdb])) tvshow = helpers.findCertainShow(sickbeard.showList, int(item[tvdb]))
except: except:
continue continue