diff --git a/Contents/Code/git.py b/Contents/Code/git.py index 773f9e2..02df592 100644 --- a/Contents/Code/git.py +++ b/Contents/Code/git.py @@ -202,12 +202,17 @@ def removeEmptyFolders(path, removeRoot=True): ''' Returns commit time and Id for a git branch ''' def getAtom_UpdateTime_Id(self, url, branch): - # Build AtomUrl - atomUrl = url + '/commits/' + branch + '.atom' - # Get Atom - atom = HTML.ElementFromURL(atomUrl) - mostRecent = atom.xpath('//entry')[0].xpath('./updated')[0].text[:-6] - commitId = atom.xpath('//entry')[0].xpath('./id')[0].text.split('/')[-1][:10] + try: + # Build AtomUrl + atomUrl = url + '/commits/' + branch + '.atom' + # Get Atom + atom = HTML.ElementFromURL(atomUrl) + mostRecent = atom.xpath('//entry')[0].xpath('./updated')[0].text[:-6] + commitId = atom.xpath('//entry')[0].xpath('./id')[0].text.split('/')[-1][:10] + except Exception, e: + commitId = '0' + mostRecent = 'Not found' + pass return {'commitId' : commitId, 'mostRecent' : mostRecent} ''' This function will return a list of bundles, where there is an update avail ''' diff --git a/VERSION b/VERSION index 6b4950e..005119b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4 +2.4.1 diff --git a/http/changelog.txt b/http/changelog.txt index 8badd29..9aa0b03 100644 --- a/http/changelog.txt +++ b/http/changelog.txt @@ -1,3 +1,10 @@ +V2.4.1: + Fix: + #264 UAS: v2.4 of WebTools UnsupportedAppStore Error + #265 SUB: No paging by letter, for TV-Shows + +#### + V2.4: Fix: #166 WT: Themes - v2.2 release - Default theme error diff --git a/http/modules/subtitlemgmt/jscript/functions_shows.js b/http/modules/subtitlemgmt/jscript/functions_shows.js index 3b7688d..a90de9f 100644 --- a/http/modules/subtitlemgmt/jscript/functions_shows.js +++ b/http/modules/subtitlemgmt/jscript/functions_shows.js @@ -49,7 +49,7 @@ subtitlemgmt.fetch_section_type_show = function(section_key, pageToShow) { var start = (Number(subtitlemgmt.selected_section.currentpage) * Number(subtitlemgmt.options.items_per_page)); webtools.loading('Library Size: ' + subtitlemgmt.selected_section.totalsize + '
Currently fetching: ' + start + '->' + (start + subtitlemgmt.options.items_per_page)); $.ajax({ - url: '/webtools2?module=pms&function=getSection&key=' + subtitlemgmt.selected_section.key + '&start=' + start + '&size=' + subtitlemgmt.options.items_per_page, + url: '/webtools2?module=pms&function=getSection&key=' + subtitlemgmt.selected_section.key + '&start=0&size=9999', cache: false, dataType: 'JSON', success: function(data) { @@ -199,7 +199,7 @@ subtitlemgmt.fetch_season_episodes = function(season_key, pageToShow) { }); } ], function() { - subtitlemgmt.display_episodes(); + subtitlemgmt.display_episodes(true); }); get_episodes.start(season_key); } @@ -234,7 +234,7 @@ subtitlemgmt.display_season = function() { if (end > subtitlemgmt.selected_section.contents.length) { end = subtitlemgmt.selected_section.contents.length } - for (var i = (subtitlemgmt.selected_section.currentpage * subtitlemgmt.options.items_per_page); i < end; i++) { + for (var i = 0; i < subtitlemgmt.selected_section.contents.length; i++) { newEntry.push('' + subtitlemgmt.selected_section.contents[i].title + 'Episodes in season: ' + subtitlemgmt.selected_section.contents[i].size + ''); } diff --git a/http/modules/subtitlemgmt/jscript/functions_video.js b/http/modules/subtitlemgmt/jscript/functions_video.js index e4650cf..41806e6 100644 --- a/http/modules/subtitlemgmt/jscript/functions_video.js +++ b/http/modules/subtitlemgmt/jscript/functions_video.js @@ -131,7 +131,7 @@ subtitlemgmt.fetch_section_type_movies = function(section_key, pageToShow) { get_section_video.start(section_key); } -subtitlemgmt.display_episodes = function () { +subtitlemgmt.display_episodes = function (forceAll) { window.scrollTo(0, 0); /* Go through all the options and modify the output accordingly. @@ -166,6 +166,11 @@ subtitlemgmt.display_episodes = function () { $('#ContentBody').html(''); + + if (forceAll) { + start = 0 + end = subtitlemgmt.selected_section.contents.length; + } for (var i = start; i < end; i++) { if (subtitlemgmt.options.options_hide_withoutsubs && subtitlemgmt.selected_section.contents[i].subtitles.length === 0) { continue;