Merge pull request #132 from Prinz23/feature/FixAddFromTrendingShowPage

CHANGES.md

@@ -11,6 +11,7 @@
 * Change ThePirateBay to use oldpiratebay as a temporary fix
 * 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 Add From Trending Show page to work with Trakt changes
 
 [develop changelog]
 

gui/slick/interfaces/default/home_trendingShows.tmpl

@@ -129,7 +129,7 @@
 #else
 #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="traktContainer">

sickbeard/webserve.py

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