The branch, frodo has been updated
via fa7947829aaf96d7c5e473dcf09bb95683e407d9 (commit)
from 04515787855f76b0620ac87ba89de65f96f10b25 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=fa7947829aaf96d7c5e473dcf09bb95683e407d9
commit fa7947829aaf96d7c5e473dcf09bb95683e407d9
Author: Martijn Kaijser <[email protected]>
Date: Tue Aug 5 17:49:19 2014 +0200
[plugin.video.attactv] 1.1.7
diff --git a/plugin.video.attactv/addon.xml b/plugin.video.attactv/addon.xml
index 5bd2e8c..f340abd 100644
--- a/plugin.video.attactv/addon.xml
+++ b/plugin.video.attactv/addon.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.attactv" name="attac tv" version="1.1.6"
provider-name="Jose Antonio Montes (jamontes)">
+<addon id="plugin.video.attactv" name="attac tv" version="1.1.7"
provider-name="Jose Antonio Montes (jamontes)">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="plugin.video.youtube" version="4.4.1"/>
- <import addon="plugin.video.vimeo" version="3.5.1"/>
<import addon="plugin.video.bliptv" version="1.8.1"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
@@ -24,5 +23,6 @@
<forum>http://forum.xbmc.org/showthread.php?tid=155306</forum>
<source>https://github.com/jamontes/plugin.video.attactv</source>
<website>http://www.attac.tv/</website>
+ <mail></mail>
</extension>
</addon>
diff --git a/plugin.video.attactv/changelog.txt
b/plugin.video.attactv/changelog.txt
index 6c920ce..13de16f 100644
--- a/plugin.video.attactv/changelog.txt
+++ b/plugin.video.attactv/changelog.txt
@@ -1,3 +1,8 @@
+1.1.7 (2014.08.04)
+- Removed the Vimeo add-on dependency due to a problem found running on Gotham.
+- Added custom Vimeo scraper to support the Vimeo videos again.
+- Improved Dailymotion parser to support fail over lower quality options.
+- Added mail tag to addon.xml
1.1.6 (2014.05.21)
- Modified pattern for embedded Dailymotion and KontextTV videos.
1.1.5 (2014.02.05)
diff --git a/plugin.video.attactv/default.py b/plugin.video.attactv/default.py
index 7ca8785..10908d3 100644
--- a/plugin.video.attactv/default.py
+++ b/plugin.video.attactv/default.py
@@ -184,7 +184,7 @@ def play_video(params):
lutil.log("attactv.play "+repr(params))
# Here we define the list of video sources supported.
- video_sources = ('youtube', 'vimeo', 'bliptv', 'kontexttv', 'dailymotion')
+ video_sources = ('dailymotion', 'youtube', 'vimeo', 'kontexttv', 'bliptv')
buffer_link = lutil.carga_web(params.get("url"))
for source in video_sources:
video_url = eval("get_playable_%s_url(buffer_link)" % source)
@@ -219,31 +219,24 @@ def get_playable_youtube_url(html):
return ""
-# This function try to get a Vimeo playable URL from the weblink and returns
it ready to call the Vimeo plugin.
+# This function try to get a Vimeo playable URL from the weblink and returns
it ready to play it.
def get_playable_vimeo_url(html):
- pattern_vimeo1 = '
value="[htp:]*?//vimeo.com/moogaloop.swf\?clip_id=([0-9]+)'
- pattern_vimeo2 = '<a href="[htp:]*?//vimeo.com/([0-9]+)">'
- pattern_vimeo3 = ' src="[htp:]*?//player.vimeo.com/video/([0-9]+)'
-
- video_id = lutil.find_first(html, pattern_vimeo1)
- if video_id:
- lutil.log("attactv.play: We have found this Vimeo video with pattern1:
%s and let's going to play it!" % video_id)
- video_url =
"plugin://plugin.video.vimeo/?path=/root/video&action=play_video&videoid=" +
video_id
- return video_url
-
- video_id = lutil.find_first(html, pattern_vimeo2)
- if video_id:
- lutil.log("attactv.play: We have found this Vimeo video with pattern2:
%s and let's going to play it!" % video_id)
- video_url =
"plugin://plugin.video.vimeo/?path=/root/video&action=play_video&videoid=" +
video_id
- return video_url
-
- video_id = lutil.find_first(html, pattern_vimeo3)
- if video_id:
- lutil.log("attactv.play: We have found this Vimeo video with pattern3:
%s and let's going to play it!" % video_id)
- video_url =
"plugin://plugin.video.vimeo/?path=/root/video&action=play_video&videoid=" +
video_id
- return video_url
-
- return ""
+ video_pattern_sd = '"sd":{.*?,"url":"([^"]*?)"'
+ vimeo_video_patterns = (
+ (' value="[htp:]*?//vimeo.com/moogaloop.swf\?clip_id=([0-9]+)',
'vimeo1'),
+ ('<a href="[htp:]*?//vimeo.com/([0-9]+)">',
'vimeo2'),
+ (' src="[htps:]*?//player.vimeo.com/video/([0-9]+)',
'vimeo3'),
+ )
+
+ for video_pattern, pattern_name in vimeo_video_patterns:
+ video_id = lutil.find_first(html, video_pattern)
+ if video_id:
+ lutil.log("attactv.play: We have found this Vimeo video with
pattern %s: %s and let's going to play it!" % (pattern_name, video_id))
+ video_info_url = 'https://player.vimeo.com/video/' + video_id
+ buffer_link = lutil.carga_web(video_info_url)
+ return lutil.find_first(buffer_link, video_pattern_sd)
+ else:
+ return ""
# This function try to get a BlipTV playable URL from the weblink and returns
it ready to call the BlipTV plugin.
@@ -288,11 +281,14 @@ def get_playable_kontexttv_url(html):
return ""
-# This function try to get a Dailymotion playable URL from the weblink and
returns it reay to play it directly.
+# This function try to get a Dailymotion playable URL from the weblink and
returns it ready to play it directly.
def get_playable_dailymotion_url(html):
pattern_dailymotion = '
src="[htp:]*?(//www.dailymotion.com/embed/video/[^"]*?)"'
- #pattern_daily_video = '"hqURL":"(.+?)"'
- pattern_daily_video = '"stream_h264_hq_url":"(.+?)"'
+ daily_video_patterns = (
+ '"stream_h264_hq_url":"(.+?)"',
+ '"stream_h264_url":"(.+?)"',
+ '"stream_h264_ld_url":"(.+?)"',
+ )
daily_url = lutil.find_first(html, pattern_dailymotion)
if daily_url:
@@ -300,11 +296,12 @@ def get_playable_dailymotion_url(html):
daily_url = "http:" + daily_url
lutil.log("attactv.play: We have found a Dailymotion video with URL:
'%s'" % daily_url)
buffer_link = lutil.carga_web(daily_url)
- video_url = lutil.find_first(buffer_link, pattern_daily_video)
- if video_url:
- video_url = video_url.replace('\\','')
- lutil.log("attactv.play: We have found this Dailymotion video:
'%s' and let's going to play it!" % video_url)
- return video_url
+ for pattern_daily_video in daily_video_patterns:
+ video_url = lutil.find_first(buffer_link, pattern_daily_video)
+ if video_url:
+ video_url = video_url.replace('\\','')
+ lutil.log("attactv.play: We have found this Dailymotion video:
'%s' and let's going to play it!" % video_url)
+ return video_url
return ""
-----------------------------------------------------------------------
Summary of changes:
plugin.video.attactv/addon.xml | 4 +-
plugin.video.attactv/changelog.txt | 5 +++
plugin.video.attactv/default.py | 63 +++++++++++++++++-------------------
3 files changed, 37 insertions(+), 35 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls.
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
