The branch, eden has been updated
via 7d4b578d33edf1880711c259d6d3e83aec21d19a (commit)
from cda0627d512f346fd5699d8c6bd110d10d86487f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7d4b578d33edf1880711c259d6d3e83aec21d19a
commit 7d4b578d33edf1880711c259d6d3e83aec21d19a
Author: beenje <[email protected]>
Date: Tue Sep 10 21:01:19 2013 +0200
[plugin.video.cinemassacre] updated to version 0.1.5
diff --git a/plugin.video.cinemassacre/addon.xml
b/plugin.video.cinemassacre/addon.xml
index c47d27e..50ffcc6 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.4"
provider-name="dethfeet, Kr0nZ">
+<addon id="plugin.video.cinemassacre" name="cinemassacre" version="0.1.5"
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 658cb13..8538d65 100644
--- a/plugin.video.cinemassacre/changelog.txt
+++ b/plugin.video.cinemassacre/changelog.txt
@@ -1,3 +1,4 @@
+0.1.5 - Fix screenwave videos to support new player page
0.1.4 - Fix screenwave videos
0.1.3 - Fix springboard videos
0.1.2 - Recent videos fix
diff --git a/plugin.video.cinemassacre/default.py
b/plugin.video.cinemassacre/default.py
index 7215378..3d09304 100644
--- a/plugin.video.cinemassacre/default.py
+++ b/plugin.video.cinemassacre/default.py
@@ -130,7 +130,18 @@ def recentPage():
pageData = "action=infinite_scroll&loop_file=loop"
page = load_page(pageUrl,pageData)
linkList = extractEpisodes(page)
- addEpisodeListToDirectory(linkList)
+ newLinkList = []
+ pDialog = xbmcgui.DialogProgress(10101)
+ ret = pDialog.create('Cinemassacre', 'Loading Recent Videos', '',
'Retrieved 0 Videos')
+ curItm = 0
+ for chk in linkList:
+ curItm = curItm + 1
+ link = urllib.unquote(chk['url'])
+ page = load_page(link)
+ if showEpisode.showEpisode(page,False) == True:
+ newLinkList.append(chk)
+ pDialog.update((curItm * 100) / len(linkList),'Loading Recent Videos',
'', 'Retrieved '+str(len(newLinkList))+' Videos')
+ addEpisodeListToDirectory(newLinkList)
def extractMenu(page,row='[]'):
navList = common2.parseDOM(page, "div", attrs={"id": "navArea"})
diff --git a/plugin.video.cinemassacre/showEpisode.py
b/plugin.video.cinemassacre/showEpisode.py
index 2a8e20b..05e1efc 100644
--- a/plugin.video.cinemassacre/showEpisode.py
+++ b/plugin.video.cinemassacre/showEpisode.py
@@ -12,7 +12,7 @@ import thisCommonFunctions
common = thisCommonFunctions
thisPlugin = int(sys.argv[1])
-def showEpisode(episode_page):
+def showEpisode(episode_page, play=True):
episode_page2 = common.parseDOM(episode_page, "div", attrs={"id":
"video-content"})
if len(episode_page2):
episode_page = episode_page2[0]
@@ -28,15 +28,18 @@ def showEpisode(episode_page):
{"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(?:[^\"\']*))"},
+ {"function":showEpisodeScreenwave,
"regex":"((?:[^\"\']*)screenwavemedia.com/(?:[^\/]*)/(?:embed|player).php(?:[^\"\']*))"},
)
for provider in providers:
regex = re.compile(provider['regex'])
videoItem = regex.search(episode_page)
if videoItem is not None:
- print "Using provider: %s" % provider
- return provider['function'](videoItem)
+ if play == True:
+ print "Using provider: %s" % provider
+ return provider['function'](videoItem)
+ else:
+ return True
def showEpisodeScreenwave(videoItem):
tmpContent = showEpisodeLoadPage(videoItem.group(1))
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cinemassacre/addon.xml | 2 +-
plugin.video.cinemassacre/changelog.txt | 1 +
plugin.video.cinemassacre/default.py | 13 ++++++++++++-
plugin.video.cinemassacre/showEpisode.py | 11 +++++++----
4 files changed, 21 insertions(+), 6 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
