From 234c1e223b10f93982dc3f5ca602b2f5ead2364a Mon Sep 17 00:00:00 2001 From: stacked Date: Thu, 28 Feb 2013 08:02:14 -0800 Subject: [PATCH] PBS v3.0.11 PBS v3.0.11 Added a setting to only show videos greater than a user-determined length --- addon.xml | 2 +- changelog.txt | 6 +++++ default.py | 33 ++++++++++++++------------ resources/language/English/strings.xml | 3 ++- resources/settings.xml | 3 ++- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/addon.xml b/addon.xml index 751dbc2..9599074 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/changelog.txt b/changelog.txt index 7eaa15c..4b4b6f0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +[B]Version 3.0.11[/B] + +- Removed deprecated video quality 'MPEG-4 500kbps' +- Set default video quality to 'MP4 800k' +- Fixed 'base' referenced before assignment error + [B]Version 3.0.10[/B] - Fixed index error when loading directories diff --git a/default.py b/default.py index e3d7f23..fc47879 100644 --- a/default.py +++ b/default.py @@ -5,8 +5,8 @@ plugin = "PBS" __author__ = 'stacked ' __url__ = 'http://code.google.com/p/plugin/' -__date__ = '01-20-2013' -__version__ = '3.0.10' +__date__ = '01-16-2014' +__version__ = '3.0.12' settings = xbmcaddon.Addon( id = 'plugin.video.pbs' ) buggalo.SUBMIT_URL = 'http://www.xbmc.byethost17.com/submit.php' dbg = False @@ -185,10 +185,10 @@ def build_search_directory( url, page ): @retry(TypeError) def find_videos( name, program_id, topic, page ): - if settings.getSetting("quality") == '0': - type = ['MPEG-4 500kbps', 'MP4 800k', HIGH] + if settings.getSetting("video") == '0': + type = ['MP4 800k', 'Legacy KIDS encoding', HIGH] else: - type = [HIGH, 'MP4 800k', 'MPEG-4 500kbps' ] + type = [HIGH, 'MP4 800k', 'Legacy KIDS encoding'] start = str( 200 * page ) url = 'None' backup_url = None @@ -232,7 +232,9 @@ def find_videos( name, program_id, topic, page ): backup_url = str(encoding.items()[0][1]['backup_url']) infoLabels = { "Title": results['title'].encode('utf-8'), "Director": "PBS", "Studio": name, "Plot": results['long_description'].encode('utf-8'), "Aired": results['airdate'].rsplit(' ')[0], "Duration": str((int(results['mediafiles'][0]['length_mseconds'])/1000)/60) } u = { 'mode': '5', 'name': results['title'].encode('utf-8'), 'url': url, 'thumb': thumb, 'plot': results['long_description'].encode('utf-8'), 'studio': name, 'backup_url': backup_url } - addListItem(label = results['title'].encode('utf-8'), image = thumb, url = u, isFolder = False, infoLabels = infoLabels, fanart = fanart, duration = str(int(results['mediafiles'][0]['length_mseconds'])/1000)) + #Only show videos longer than ___ minutes + if int(results['mediafiles'][0]['length_mseconds'])/1000/60 > int(settings.getSetting("minimum_duration")): + addListItem(label = results['title'].encode('utf-8'), image = thumb, url = u, isFolder = False, infoLabels = infoLabels, fanart = fanart, duration = str(int(results['mediafiles'][0]['length_mseconds'])/1000)) if topic == 'False': play_video( results['title'].encode('utf-8'), url, thumb, results['long_description'].encode('utf-8'), name.encode('utf-8'), None, backup_url ) return @@ -255,6 +257,7 @@ def play_video( name, url, thumb, plot, studio, starttime, backup_url ): print 'PBS - ' + studio + ' - ' + name print url playpath = False + defaulturl = url #Release Urls if 'http://release.theplatform.com/' in url: @@ -274,15 +277,6 @@ def play_video( name, url, thumb, plot, studio, starttime, backup_url ): try: base = re.compile( '' ).findall( data )[0] src = re.compile( 'access to this content. Preferred video quality: 2500k-1200k - 800k-500k + 800k There was a connection error: If this problem persists, please submit the error report. Retry Quit There was an index error. Enable default view for Confluence skin + Only show videos longer than ___ minutes diff --git a/resources/settings.xml b/resources/settings.xml index c3d6889..e595fac 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -1,4 +1,5 @@ - + +