The branch, frodo has been updated
via 6e97d014cb521068b8673eea589cf81fd7db7a81 (commit)
from 708cf1eba1cbbc95dc14c765eae0de02818309c2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6e97d014cb521068b8673eea589cf81fd7db7a81
commit 6e97d014cb521068b8673eea589cf81fd7db7a81
Author: Martijn Kaijser <[email protected]>
Date: Mon Oct 28 23:58:50 2013 +0100
[plugin.video.vimeo] 3.5.3
diff --git a/plugin.video.vimeo/VimeoPlayer.py
b/plugin.video.vimeo/VimeoPlayer.py
index 12e46e4..2eebe1a 100644
--- a/plugin.video.vimeo/VimeoPlayer.py
+++ b/plugin.video.vimeo/VimeoPlayer.py
@@ -72,14 +72,15 @@ class VimeoPlayer():
def scrapeVideoInfo(self, params):
get = params.get
- result = self.common.fetchPage({"link": "http://www.vimeo.com/%s"; %
get("videoid")})
+ #result = self.common.fetchPage({"link": "http://www.vimeo.com/%s"; %
get("videoid")})
+ result = self.common.fetchPage({"link":
"http://player.vimeo.com/v2/video/%s/config?type=moogaloop&referrer=&player_url=player.vimeo.com&v=1.0.0&cdn_url=http://a.vimeocdn.com";
% get("videoid")})
collection = {}
if result["status"] == 200:
html = result["content"]
- html = html[html.find('{config:{'):]
- html = html[:html.find('}}},') + 3]
- html = html.replace("{config:{", '{"config":{') + "}"
print repr(html)
+ #html = html[html.find('{config:{'):]
+ #html = html[:html.find('}}},') + 3]
+ #html = html.replace("{config:{", '{"config":{') + "}"
collection = json.loads(html)
return collection
@@ -106,7 +107,26 @@ class VimeoPlayer():
isHD = collection["config"]["video"]["hd"]
if str(isHD) == "1":
video['isHD'] = "1"
-
+ elif collection.has_key("request"):
+ video['videoid'] = get("videoid")
+ title = "" #collection["config"]["video"]["title"]
+ if len(title) == 0:
+ title = "No Title"
+ title = self.common.replaceHTMLCodes(title)
+ video['Title'] = title
+ h264 = collection["request"]["files"]["h264"]
+ video['Duration'] = "0"
+ video['thumbnail'] = ""
+ video['Studio'] = ""
+ video['request_signature'] = ""
+ video['request_signature_expires'] = ""
+ video['urls'] = h264
+
+ if h264.get("hd"):
+ video['isHD'] = "1"
+ video['video_url'] = h264["hd"]["url"]
+ else:
+ video['video_url'] = h264["sd"]["url"]
if len(video) == 0:
self.common.log("- Couldn't parse API output, Vimeo doesn't seem
to know this video id?")
@@ -144,11 +164,11 @@ class VimeoPlayer():
quality = self.selectVideoQuality(params, video)
if ('apierror' not in video):
- video_url = self.urls['embed_stream'] % (get("videoid"),
video['request_signature'], video['request_signature_expires'], quality)
- result = self.common.fetchPage({"link": video_url, "no-content":
"true"})
- print repr(result)
- video['video_url'] = result["new_url"]
-
+ #video_url = self.urls['embed_stream'] % (get("videoid"),
video['request_signature'], video['request_signature_expires'], quality)
+ #result = self.common.fetchPage({"link": video_url, "no-content":
"true"})
+ #print repr(result)
+ #video['video_url'] = result["new_url"]
+ if quality in video["urls"]: video['video_url'] =
video["urls"][quality]["url"]
self.common.log("Done")
return (video, 200)
else:
diff --git a/plugin.video.vimeo/addon.xml b/plugin.video.vimeo/addon.xml
index 6440b5b..b14b864 100644
--- a/plugin.video.vimeo/addon.xml
+++ b/plugin.video.vimeo/addon.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<addon id="plugin.video.vimeo" name="Vimeo" provider-name="TheCollective"
version="3.5.2">
+<addon id="plugin.video.vimeo" name="Vimeo" provider-name="TheCollective"
version="3.5.3">
<requires>
<import addon="xbmc.python" version="2.1.0" />
<import addon="script.common.plugin.cache" version="2.5.2" />
-----------------------------------------------------------------------
Summary of changes:
plugin.video.vimeo/VimeoPlayer.py | 40 +++++++++++++++++++++++++++---------
plugin.video.vimeo/addon.xml | 2 +-
2 files changed, 31 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
