From 8066983384f1e392bde860aefa8505fb14572e92 Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Thu, 11 Dec 2014 12:46:01 -0800
Subject: [PATCH] Updated KAT provider urls.

KAT Provider now uses feedcache to get its results via rss feeds.

Fixed issues with Trakt.TV notifications and adding of trending shows

Improved Trakt trending shows page, now shows progress animation well it waits to load shows list.
---
 .../default/home_trendingShows.tmpl           | 44 ++----------------
 .../interfaces/default/trendingShows.tmpl     | 45 +++++++++++++++++++
 gui/slick/js/addTrendingShow.js               | 11 +++++
 sickbeard/webserve.py                         | 27 ++++++-----
 4 files changed, 77 insertions(+), 50 deletions(-)
 create mode 100644 gui/slick/interfaces/default/trendingShows.tmpl
 create mode 100644 gui/slick/js/addTrendingShow.js

diff --git a/gui/slick/interfaces/default/home_trendingShows.tmpl b/gui/slick/interfaces/default/home_trendingShows.tmpl
index ccdf1de4..b57df462 100644
--- a/gui/slick/interfaces/default/home_trendingShows.tmpl
+++ b/gui/slick/interfaces/default/home_trendingShows.tmpl
@@ -14,6 +14,7 @@
 #import os.path
 #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_top.tmpl')
 
+<script type="text/javascript" src="$sbRoot/js/addTrendingShow.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/rootDirs.js?$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/plotTooltip.js?$sbPID"></script>
 
@@ -90,7 +91,6 @@
 	<h1 class="title">$title</h1>
 #end if
 
-#if $trending_shows
 <div id="tabs">
     <ul>
         <li><a href="#tabs-1">Manage Directories</a></li>
@@ -119,46 +119,10 @@
 		<option value="desc">Desc</option>
 	</select>
 </div>
-#end if
 
-<div id="container">
-
-#if None is $trending_shows
-	<div class="trakt_show" style="width:100%; margin-top:20px">
-		<p class="red-text">Trakt API did not return results, this can happen from time to time.
-		<br /><br />This view should auto refresh every 10 mins.</p>
-	</div>
-#else
-#for $cur_show in $trending_shows:
-#if not 'ExistsInLibrary' in $cur_show['tvdb_id']:
-
-#set $image = re.sub(r'(?im)(.*)(\..*?)$', r'\1-300\2', $cur_show['images']['poster'], 0)
-
-	<div class="trakt_show" data-name="$cur_show['title']" data-rating="$cur_show['ratings']['percentage']" data-votes="$cur_show['ratings']['votes']">
-		<div class="traktContainer">
-			<div class="trakt-image">
-				<a class="trakt-image" href="<%= anon_url(cur_show['url']) %>" target="_blank"><img alt="" class="trakt-image" src="${image}" /></a>
-			</div>
-
-			<div class="show-title">
-				<%= (cur_show['title'], '<span>&nbsp;</span>')[ '' == cur_show['title']] %>
-			</div>
-
-		<div class="clearfix">
-			<p>$cur_show['ratings']['percentage']% <img src="$sbRoot/images/heart.png"></p>
-			<i>$cur_show['ratings']['votes'] votes</i>
-
-			<div class="traktShowTitleIcons">
-				<a href="$sbRoot/home/addShows/addTraktShow?indexer_id=${cur_show['tvdb_id']}&amp;showName=${cur_show['title']}" class="btn btn-xs">Add Show</a>
-			</div>
-		</div>
-		</div>
-	</div>
-
-#end if
-#end for
-#end if
-</div>
+<br />
+<div id="container"></div>
+<br />
 
 <script type="text/javascript" charset="utf-8">
 <!--
diff --git a/gui/slick/interfaces/default/trendingShows.tmpl b/gui/slick/interfaces/default/trendingShows.tmpl
new file mode 100644
index 00000000..2df20cf6
--- /dev/null
+++ b/gui/slick/interfaces/default/trendingShows.tmpl
@@ -0,0 +1,45 @@
+#import sickbeard
+#import datetime
+#import re
+#from sickbeard.common import *
+#from sickbeard import sbdatetime
+#from sickbeard.helpers import anon_url
+
+#set global $title='Trending Shows'
+#set global $header='Trending Shows'
+
+#set global $sbPath='..'
+
+#set global $topmenu='comingEpisodes'
+#import os.path
+
+#if not $trending_shows
+	<div class="trakt_show" style="width:100%; margin-top:20px">
+		<p class="red-text">Trakt API did not return any results, please check your config.
+	</div>
+#else
+#for $cur_show in $trending_shows:
+    #set $image = re.sub(r'(?im)(.*)(\..*?)$', r'\1-300\2', $cur_show['images']['poster'], 0)
+
+    <div class="trakt_show" data-name="$cur_show['title']" data-rating="$cur_show['ratings']['percentage']" data-votes="$cur_show['ratings']['votes']">
+        <div class="traktContainer">
+            <div class="trakt-image">
+                <a class="trakt-image" href="<%= anon_url(cur_show['url']) %>" target="_blank"><img alt="" class="trakt-image" src="${image}" /></a>
+            </div>
+
+            <div class="show-title">
+                <%= (cur_show['title'], '<span>&nbsp;</span>')[ '' == cur_show['title']] %>
+            </div>
+
+        <div class="clearfix">
+            <p>$cur_show['ratings']['percentage']% <img src="$sbRoot/images/heart.png"></p>
+            <i>$cur_show['ratings']['votes'] votes</i>
+
+            <div class="traktShowTitleIcons">
+                <a href="$sbRoot/home/addShows/addTraktShow?indexer_id=${cur_show['tvdb_id'] or cur_show['tvrage_id']}&amp;showName=${cur_show['title']}" class="btn btn-xs">Add Show</a>
+            </div>
+        </div>
+        </div>
+    </div>
+#end for
+#end if
\ No newline at end of file
diff --git a/gui/slick/js/addTrendingShow.js b/gui/slick/js/addTrendingShow.js
new file mode 100644
index 00000000..dff50e63
--- /dev/null
+++ b/gui/slick/js/addTrendingShow.js
@@ -0,0 +1,11 @@
+$(document).ready(function() {
+    function loadContent() {
+        $('#container').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> loading trending shows...');
+        $.get(sbRoot+'/home/addShows/getTrendingShows/', function(data) {
+            $('#container').html(data);
+        });
+
+    }
+
+    loadContent();
+});
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 508dcbf0..e3e2c168 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -2234,21 +2234,28 @@ class HomeAddShows(Home):
         t = PageTemplate(rh=self, file="home_trendingShows.tmpl")
         t.submenu = self.HomeMenu()
 
+        return t
+
+    def getTrendingShows(self, *args, **kwargs):
+        """
+        Display the new show page which collects a tvdb id, folder, and extra options and
+        posts them to addNewShow
+        """
+        t = PageTemplate(rh=self, file="trendingShows.tmpl")
+        t.submenu = self.HomeMenu()
+
         t.trending_shows = []
 
         trakt_api = TraktAPI(sickbeard.TRAKT_API, sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_PASSWORD)
 
         try:
-            trending_shows = trakt_api.traktRequest("shows/trending.json/%APIKEY%")
-
-            if trending_shows:
-                for show in trending_shows:
-                    try:
-                        if not helpers.findCertainShow(sickbeard.showList,
-                                                       [int(show['tvdb_id']), int(show['tvrage_id'])]):
-                            t.trending_shows += [show]
-                    except exceptions.MultipleShowObjectsException:
-                        continue
+            for show in trakt_api.traktRequest("shows/trending.json/%APIKEY%") or []:
+                try:
+                    if not helpers.findCertainShow(sickbeard.showList,
+                                                   [int(show['tvdb_id']), int(show['tvrage_id'])]):
+                        t.trending_shows += [show]
+                except exceptions.MultipleShowObjectsException:
+                    continue
         except (traktException, traktAuthException, traktServerBusy) as e:
             logger.log(u"Could not connect to Trakt service: %s" % ex(e), logger.WARNING)