The branch, eden has been updated
via 388057e43b5c3378bba28b92a5e6c55a57e173a7 (commit)
from ced9e766a3604ced22354ed8209935879a6f691d (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=388057e43b5c3378bba28b92a5e6c55a57e173a7
commit 388057e43b5c3378bba28b92a5e6c55a57e173a7
Author: beenje <[email protected]>
Date: Fri May 31 22:48:44 2013 +0200
[plugin.video.cinemassacre] updated to version 0.1.4
diff --git a/plugin.video.cinemassacre/addon.xml
b/plugin.video.cinemassacre/addon.xml
index e0925ca..c47d27e 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.3"
provider-name="dethfeet, Kr0nZ">
+<addon id="plugin.video.cinemassacre" name="cinemassacre" version="0.1.4"
provider-name="dethfeet, Kr0nZ">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="xbmc.gui" version="2.11"/>
@@ -14,6 +14,11 @@
<description lang="en">Home of the Angry Video Game Nerd, Monster Madness,
movie reviews, top 10's, and commentary, retro and classic videos</description>
<platform>all</platform>
<language>en</language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+ <forum>http://forum.xbmc.org/showthread.php?tid=147672</forum>
+ <website>http://cinemassacre.com/</website>
+ <source>https://github.com/Kr0nZ/plugin.video.cinemassacre</source>
+ <email>[email protected]</email>
</extension>
</addon>
diff --git a/plugin.video.cinemassacre/changelog.txt
b/plugin.video.cinemassacre/changelog.txt
index 5d89346..658cb13 100644
--- a/plugin.video.cinemassacre/changelog.txt
+++ b/plugin.video.cinemassacre/changelog.txt
@@ -1,3 +1,4 @@
+0.1.4 - Fix screenwave videos
0.1.3 - Fix springboard videos
0.1.2 - Recent videos fix
0.1.0 - Updated With WebSite Changes
diff --git a/plugin.video.cinemassacre/resources/defaults.xml
b/plugin.video.cinemassacre/resources/defaults.xml
index 359062d..76ac935 100644
--- a/plugin.video.cinemassacre/resources/defaults.xml
+++ b/plugin.video.cinemassacre/resources/defaults.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
- <defaults>
- <icons>
- <icon url="/category/avgn/" image="avgn.png"/>
- <icon url="/category/boardjames/" image="boardJ.png"/>
- <icon url="/category/ykwb/" image="ykwbs.png"/>
- </icons>
- <excludeUrls>
- <url>/fanstuff/</url>
- <url>/full-list-of-avgn-videos/</url>
- <url>/fan-art-page</url>
- <url>/2011/01/19/avgn-iphone-game-texting-of-the-bread/</url>
- <url>/2010/03/10/avgn-game-over-2-by-gavin-maclean/</url>
- <url>/2009/08/17/avgn-ko-boxing/</url>
- <url>/2009/01/19/11909-avgn-game-over-by-gavin-maclean/</url>
-
<url>/2008/08/03/the-avgn-in-pixel-land-blast-by-kevin-berryman/</url>
- <url>/2008/02/25/the-angry-video-game-by-eric-ruth/</url>
- <url>/fan-songs-page</url>
- <url>/category/avgn/avgn-collection/</url>
- <url>/2007/03/22/game-collection/</url>
- <url>http://www.screwattackstore.com/avgntshirts.html</url>
-
<url>http://cinemassacre.com/category/site-2/featuredarticles/</url>
- <url>http://cinemassacre.com/donate/</url>
- <url>http://cinemassacre.com/faq/</url>
- <url>http://cinemassacre.com/links/</url>
- <url>http://cinemassacre.com/partners/</url>
- <url>/terms-of-service/</url>
- <url>http://cinemassacre.com/contact/</url>
- </excludeUrls>
- </defaults>
+<?xml version="1.0" encoding="utf-8"?>
+ <defaults>
+ <icons>
+ <icon url="/category/avgn/" image="avgn.png"/>
+ <icon url="/category/boardjames/" image="boardJ.png"/>
+ <icon url="/category/ykwb/" image="ykwbs.png"/>
+ </icons>
+ <excludeUrls>
+ <url>/fanstuff/</url>
+ <url>/full-list-of-avgn-videos/</url>
+ <url>/fan-art-page</url>
+ <url>/2011/01/19/avgn-iphone-game-texting-of-the-bread/</url>
+ <url>/2010/03/10/avgn-game-over-2-by-gavin-maclean/</url>
+ <url>/2009/08/17/avgn-ko-boxing/</url>
+ <url>/2009/01/19/11909-avgn-game-over-by-gavin-maclean/</url>
+
<url>/2008/08/03/the-avgn-in-pixel-land-blast-by-kevin-berryman/</url>
+ <url>/2008/02/25/the-angry-video-game-by-eric-ruth/</url>
+ <url>/fan-songs-page</url>
+ <url>/category/avgn/avgn-collection/</url>
+ <url>/2007/03/22/game-collection/</url>
+ <url>http://www.screwattackstore.com/avgntshirts.html</url>
+
<url>http://cinemassacre.com/category/site-2/featuredarticles/</url>
+ <url>http://cinemassacre.com/donate/</url>
+ <url>http://cinemassacre.com/faq/</url>
+ <url>http://cinemassacre.com/links/</url>
+ <url>http://cinemassacre.com/partners/</url>
+ <url>/terms-of-service/</url>
+ <url>http://cinemassacre.com/contact/</url>
+ </excludeUrls>
+ </defaults>
diff --git a/plugin.video.cinemassacre/showEpisode.py
b/plugin.video.cinemassacre/showEpisode.py
index 4d97323..2a8e20b 100644
--- a/plugin.video.cinemassacre/showEpisode.py
+++ b/plugin.video.cinemassacre/showEpisode.py
@@ -35,6 +35,7 @@ def showEpisode(episode_page):
regex = re.compile(provider['regex'])
videoItem = regex.search(episode_page)
if videoItem is not None:
+ print "Using provider: %s" % provider
return provider['function'](videoItem)
def showEpisodeScreenwave(videoItem):
@@ -42,15 +43,13 @@ def showEpisodeScreenwave(videoItem):
streamerVal = re.compile('streamer(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\']*)',
re.DOTALL).findall(tmpContent)
flashplayerVal =
re.compile('flashplayer(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\']*)',
re.DOTALL).findall(tmpContent)
- levelsVal = re.compile('levels(?:[\'|\"]*): \[(.*)\],',
re.DOTALL).findall(tmpContent)
- files = ""
- if len(levelsVal)>0:
- filesVal = re.compile('file(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\'|\"]*)',
re.DOTALL).findall(levelsVal[0])
- for i in range(0,len(filesVal)):
- if "high" in filesVal[i]:
- files = filesVal[i]
- break
-
+ filesVal = re.compile('file(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\'|\"]*)',
re.DOTALL).findall(tmpContent)
+
+ for i in range(0,len(filesVal)):
+ if "high" in filesVal[i]:
+ files = filesVal[i]
+ break
+
if len(streamerVal)>0 and len(flashplayerVal)>0 and len(files)>0:
rtmpurl = streamerVal[0]
swfVfy = flashplayerVal[0]
@@ -89,17 +88,18 @@ def showEpisodeBip(videoItem):
_regex_extractVideoFeedURL3 = re.compile("data-episode-id=\"(.+?)\"",
re.DOTALL);
videoLink = videoItem.group(1)
-
+
#GET the 301 redirect URL
req = urllib2.Request(videoLink)
response = urllib2.urlopen(req)
fullURL = response.geturl()
-
+
feedURL = _regex_extractVideoFeedURL.search(fullURL)
if feedURL is None:
feedURL = _regex_extractVideoFeedURL2.search(fullURL)
if feedURL is None:
feedURL = _regex_extractVideoFeedURL3.search(response.read())
+
feedURL = urllib.unquote(feedURL.group(1))
blipId = feedURL[feedURL.rfind("/") + 1:]
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cinemassacre/addon.xml | 7 ++-
plugin.video.cinemassacre/changelog.txt | 1 +
plugin.video.cinemassacre/resources/defaults.xml | 60 +++++++++++-----------
plugin.video.cinemassacre/showEpisode.py | 22 ++++----
4 files changed, 48 insertions(+), 42 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
