The branch, frodo has been updated via 2bfc92fa946a3de09a9997dcdb5237000493690e (commit) from f2508c5fb2883e1d70c9345b5f91cdf83d57f653 (commit)
- Log ----------------------------------------------------------------- http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=2bfc92fa946a3de09a9997dcdb5237000493690e commit 2bfc92fa946a3de09a9997dcdb5237000493690e Author: M. Kaijser <mcm.kaij...@gmail.com> Date: Fri Jul 26 11:36:30 2013 +0200 [plugin.video.eevblog] 0.2.3 diff --git a/plugin.video.eevblog/addon.xml b/plugin.video.eevblog/addon.xml index 468dabd..9725792 100644 --- a/plugin.video.eevblog/addon.xml +++ b/plugin.video.eevblog/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="plugin.video.eevblog" name="EEVblog" - version="0.2.2" + version="0.2.3" provider-name="Clumsy"> <requires> <import addon="xbmc.python" version="2.0"/> diff --git a/plugin.video.eevblog/changelog.txt b/plugin.video.eevblog/changelog.txt index 0330fd9..eef4b2f 100644 --- a/plugin.video.eevblog/changelog.txt +++ b/plugin.video.eevblog/changelog.txt @@ -1,6 +1,6 @@ -[B|Version 0.2.2[/B] +[B|Version 0.2.3[/B] -- fixes some videos not playing. Thanks to Jonathan Fabian +- another workaround for attempts at parsing html with regexp. thanks mw9 [B]Version 0.2.1[/B] diff --git a/plugin.video.eevblog/default.py b/plugin.video.eevblog/default.py index 22b0f36..a9d2a8d 100644 --- a/plugin.video.eevblog/default.py +++ b/plugin.video.eevblog/default.py @@ -40,14 +40,14 @@ def build_episodes_directory(): url = 'http://www.eevblog.com/episodes/' data = open_url(url) match = re.compile('<body>(.+?)</body>', re.DOTALL).findall(data) - youtube_url_name = re.compile(r'<a href ="(.+?)" title="(EEVblog #.+?)">', re.DOTALL).findall(match[0]) + youtube_url_name = re.compile(r'<a href ="(.+?)" title="(EEVblog #.+?)">', re.DOTALL + re.IGNORECASE).findall(match[0]) for ep_url, name in youtube_url_name: listitem = xbmcgui.ListItem(label = name, iconImage = "", thumbnailImage = "") #listitem.setInfo( type = "Video", infoLabels = { "Title": name, "Director": __plugin__, "Studio": __plugin__, "Genre": "Video Blog", "Plot": plot[0], "Episode": "" } ) - #u = sys.argv[0] + "?mode=2&name=" + name + "&youtube_video_id="+ urllib.quote_plus(youtube_video_id[0]) + "&plot=" + urllib.quote_plus(clean(plot[0])) + "&genre=" + "VideoBlog" + "&episode=" + urllib.quote_plus("0") - u = sys.argv[0] + "?mode=2&url=" + ep_url + "&name=" + name - xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u, listitem = listitem, isFolder = False) - xbmcplugin.addSortMethod( handle = int(sys.argv[ 1 ]), sortMethod = xbmcplugin.SORT_METHOD_NONE ) + if ep_url: + u = sys.argv[0] + "?mode=2&url=" + ep_url + "&name=" + name + xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u, listitem = listitem, isFolder = False) + xbmcplugin.addSortMethod( handle = int(sys.argv[ 1 ]), sortMethod = xbmcplugin.SORT_METHOD_NONE ) def clean(name): remove = [('&','&'), ('"','"'), (''','\''), ('\r\n',''), (''','\''), ('.','')] @@ -62,11 +62,11 @@ def play_video(ep_url): youtube_video_id = re.compile('<param name="movie" value=".*?/v/(.+?)[&\?].').findall(ep_data) # Ugly hack for a change in the page src from videos 140 onwards. - if len(youtube_video_id) == 0: - youtube_video_id = re.compile('src="http://www.youtube.com/embed/(.*?)"').findall(ep_data) + if not youtube_video_id: + youtube_video_id = re.compile('youtube.com/embed/(.*?)"').findall(ep_data) # Close the busy waiting dialog, if the youtube url wasn't parsed correctly. - if len(youtube_video_id) == 0: + if not youtube_video_id: xbmc.executebuiltin('Dialog.Close(busydialog)') return ----------------------------------------------------------------------- Summary of changes: plugin.video.eevblog/addon.xml | 2 +- plugin.video.eevblog/changelog.txt | 4 ++-- plugin.video.eevblog/default.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- Plugins ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons