The branch, eden has been updated
via 8e420a5aa685ff866c75aa4beb6c78a1d6e05615 (commit)
from 56d19e2c203d78d7ea09cb6ce530d6470858dd49 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8e420a5aa685ff866c75aa4beb6c78a1d6e05615
commit 8e420a5aa685ff866c75aa4beb6c78a1d6e05615
Author: beenje <[email protected]>
Date: Thu Jan 24 21:57:16 2013 +0100
[plugin.video.cinemassacre] updated to version 0.1.3
diff --git a/plugin.video.cinemassacre/addon.xml
b/plugin.video.cinemassacre/addon.xml
index 0c939eb..e0925ca 100644
--- a/plugin.video.cinemassacre/addon.xml
+++ b/plugin.video.cinemassacre/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.cinemassacre" name="cinemassacre" version="0.1.0"
provider-name="dethfeet, Kr0nZ">
+<addon id="plugin.video.cinemassacre" name="cinemassacre" version="0.1.3"
provider-name="dethfeet, Kr0nZ">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="xbmc.gui" version="2.11"/>
diff --git a/plugin.video.cinemassacre/changelog.txt
b/plugin.video.cinemassacre/changelog.txt
index 847e336..5d89346 100644
--- a/plugin.video.cinemassacre/changelog.txt
+++ b/plugin.video.cinemassacre/changelog.txt
@@ -1,3 +1,5 @@
+0.1.3 - Fix springboard videos
+0.1.2 - Recent videos fix
0.1.0 - Updated With WebSite Changes
0.0.9 - Added Screenwave Media Support
0.0.8 - Handle shorten URLs with springboard videos
diff --git a/plugin.video.cinemassacre/default.py
b/plugin.video.cinemassacre/default.py
index 042c65a..7215378 100644
--- a/plugin.video.cinemassacre/default.py
+++ b/plugin.video.cinemassacre/default.py
@@ -126,15 +126,10 @@ def subMenu(link,row='[]'):
def recentPage():
global thisPlugin
- page = load_page(baseLink)
- show = common2.parseDOM(page, "div", attrs={"class": "footercontainer3"})
- show = common2.parseDOM(show, "div", attrs={"class": "footeritem"})
- show = common2.parseDOM(show, "li")
- linkList = []
- for item in show:
- title = common2.parseDOM(item, "a")[0]
- link = common2.parseDOM(item, "a", ret="href")[0]
- linkList.append({"title":title, "url":link, "thumb":""})
+ pageUrl = baseLink + "wp-admin/admin-ajax.php"
+ pageData = "action=infinite_scroll&loop_file=loop"
+ page = load_page(pageUrl,pageData)
+ linkList = extractEpisodes(page)
addEpisodeListToDirectory(linkList)
def extractMenu(page,row='[]'):
diff --git a/plugin.video.cinemassacre/showEpisode.py
b/plugin.video.cinemassacre/showEpisode.py
index 6000f1c..4d97323 100644
--- a/plugin.video.cinemassacre/showEpisode.py
+++ b/plugin.video.cinemassacre/showEpisode.py
@@ -25,7 +25,8 @@ def showEpisode(episode_page):
{"function":showEpisodeSpringboard,
"regex":"\\$sb\\(\"(.*?)\",{\"sbFeed\":{\"partnerId\":(.*?),\"type\":\"video\",\"contentId\":(.*?),\"cname\":\"(.*?)\"},\"style\":{\"width\":.*?,\"height\":.*?}}\\);"},
{"function":showEpisodeDaylimotion,
"regex":"(http://www.dailymotion.com/video/.*?)_"},
{"function":showEpisodeGametrailers, "regex":"<a
href=\"(http://www.gametrailers.com/videos/(.*).*)\" target=\"_blank\">"},
- {"function":showEpisodeSpringboadAfterResolve, "regex":"<script
src=\"http://www.springboardplatform.com/js/overlay\";></script><iframe
id=\"(.*?)\" src=\"(.*?)\""},
+ {"function":showEpisodeSpringboadAfterResolve,
"regex":"src=\"(http\:\/\/cdn\.springboard\.gorillanation\.com/mediaplayer/springboard/video/(?:.*?)/(?:.*?)/(?:.*?)/)"},
+ {"function":showEpisodeSpringboadAfterResolve, "regex":"<script
src=\"http://www.springboardplatform.com/js/overlay\";></script><iframe
id=\"(?:.*?)\" src=\"(.*?)\""},
{"function":showEpisodeSpike, "regex":"<a
href=\"(http://www.spike.com/.*?)\""},
{"function":showEpisodeScreenwave,
"regex":"((?:[^\"\']*)screenwavemedia.com/(?:[^\/]*)/embed.php(?:[^\"\']*))"},
)
@@ -69,13 +70,16 @@ def showEpisodeScreenwave(videoItem):
def showEpisodeSpringboadAfterResolve(videoItem):
_regex_extractVideoParameters =
re.compile("http://cms\.springboard.*\.com/(.*?)/(.*?)/video/(.*?)/.*?/(.*?)")
+ _regex_extractVideoParameters2 =
re.compile("http\://cms\.springboardplatform\.com/xml_feeds_advanced/(.*?)/(.*?)/rss3/(.*?)/")
# Handle shortened URLs
- req = urllib2.Request(videoItem.group(2))
+ req = urllib2.Request(videoItem.group(1))
response = urllib2.urlopen(req)
fullURL = response.geturl()
videoItem = _regex_extractVideoParameters.search(fullURL)
+ if videoItem is None:
+ videoItem = _regex_extractVideoParameters2.search(fullURL)
showEpisodeSpringboard(videoItem)
return False
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cinemassacre/addon.xml | 2 +-
plugin.video.cinemassacre/changelog.txt | 2 ++
plugin.video.cinemassacre/default.py | 13 ++++---------
plugin.video.cinemassacre/showEpisode.py | 8 ++++++--
4 files changed, 13 insertions(+), 12 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
