moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00
Code Issues Releases Wiki Activity

Fixed small cosmetic bug with trakt trending shows page.

Browse Source 
KAT torrent provider now gets and stores size and publishing date info.

Fixed feedcache issue with KAT torrent provider

Added timeout for trakt trending shows page
This commit is contained in:
echel0n 2014-12-11 13:33:20 -08:00
parent 7f0dd9cbef
commit 2cd72ad4e8
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gui/slick/js/addTrendingShow.js
View File

@ -1,10 +1,20 @@
$(document).ready(function() { $(document).ready(function() {
function loadContent() { var trendingRequestXhr = null;
$('#trendingShows').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> loading trending shows...');
$.get(sbRoot+'/home/addShows/getTrendingShows/', function(data) {
$('#trendingShows').html(data);
});
function loadContent() {
if (trendingRequestXhr) trendingRequestXhr.abort();
$('#trendingShows').html('<img id="searchingAnim" src="' + sbRoot + '/images/loading32' + themeSpinner + '.gif" height="32" width="32" /> loading trending shows...');
trendingRequestXhr = $.ajax({
url: sbRoot + '/home/addShows/getTrendingShows/',
timeout: 60 * 1000,
error: function () {
$('#trendingShows').empty().html('Trakt timed out, refresh page to try again');
},
success: function (data) {
$('#trendingShows').html(data);
}
});
} }
loadContent(); loadContent();

3
sickbeard/webserve.py
View File

@ -2249,7 +2249,8 @@ class HomeAddShows(Home):
trakt_api = TraktAPI(sickbeard.TRAKT_API, sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_PASSWORD) trakt_api = TraktAPI(sickbeard.TRAKT_API, sickbeard.TRAKT_USERNAME, sickbeard.TRAKT_PASSWORD)
try: try:
for show in trakt_api.traktRequest("shows/trending.json/%APIKEY%") or []: shows = trakt_api.traktRequest("shows/trending.json/%APIKEY%") or []
for show in shows:
try: try:
if not helpers.findCertainShow(sickbeard.showList, if not helpers.findCertainShow(sickbeard.showList,
[int(show['tvdb_id']), int(show['tvrage_id'])]): [int(show['tvdb_id']), int(show['tvrage_id'])]):