The branch, frodo has been updated
via 676ce36562eee058c17911c285ed23ed9979547a (commit)
via c8a2e9e3ff65897dc903d83b4a132d7b88ea171d (commit)
from f90d96c6bc2ca089968214762ca850d961475a96 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=676ce36562eee058c17911c285ed23ed9979547a
commit 676ce36562eee058c17911c285ed23ed9979547a
Author: sphere <[email protected]>
Date: Wed Mar 5 09:16:39 2014 +0100
[plugin.video.cinemassacre] updated to version 1.0.6
diff --git a/plugin.video.cinemassacre/addon.xml
b/plugin.video.cinemassacre/addon.xml
index 938db81..6951370 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="1.0.5"
provider-name="dethfeet, Kr0nZ">
+<addon id="plugin.video.cinemassacre" name="cinemassacre" version="1.0.6"
provider-name="dethfeet, Kr0nZ">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.gui" version="4.0.0"/>
diff --git a/plugin.video.cinemassacre/changelog.txt
b/plugin.video.cinemassacre/changelog.txt
index e17c886..6014aeb 100644
--- a/plugin.video.cinemassacre/changelog.txt
+++ b/plugin.video.cinemassacre/changelog.txt
@@ -1,3 +1,4 @@
+1.0.6 - Fix screenwave video playback again
1.0.5 - Fix screenwave videos to support new player page
1.0.4 - Fix screenwave videos
1.0.3 - Fix springboard videos
diff --git a/plugin.video.cinemassacre/showEpisode.py
b/plugin.video.cinemassacre/showEpisode.py
index 05e1efc..4a07a98 100644
--- a/plugin.video.cinemassacre/showEpisode.py
+++ b/plugin.video.cinemassacre/showEpisode.py
@@ -43,33 +43,18 @@ def showEpisode(episode_page, play=True):
def showEpisodeScreenwave(videoItem):
tmpContent = showEpisodeLoadPage(videoItem.group(1))
-
- streamerVal = re.compile('streamer(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\']*)',
re.DOTALL).findall(tmpContent)
- flashplayerVal =
re.compile('flashplayer(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\']*)',
re.DOTALL).findall(tmpContent)
+
filesVal = re.compile('file(?:[\'|\"]*):(?:[\s|\'|\"]*)([^\'|\"]*)',
re.DOTALL).findall(tmpContent)
for i in range(0,len(filesVal)):
- if "high" in filesVal[i]:
- files = filesVal[i]
+ if ("high" in filesVal[i]) and ("mp4" in filesVal[i]):
+ file = filesVal[i]
break
- if len(streamerVal)>0 and len(flashplayerVal)>0 and len(files)>0:
- rtmpurl = streamerVal[0]
- swfVfy = flashplayerVal[0]
-
- fileExt = re.compile('\.([^.]+)$', re.DOTALL).findall(files)
- if len(fileExt)>0:
- files = fileExt[0] + ":" + files
-
- if rtmpurl[-1:] != "/":
- rtmpurl = rtmpurl + "/"
- rtmpurl = rtmpurl + files
-
- segmentUrl = rtmpurl + " playpath=" + files + " pageurl=" +
videoItem.group(1) + " swfVfy=" + swfVfy
-
- listitem = xbmcgui.ListItem(path=segmentUrl)
+ if file:
+ listitem = xbmcgui.ListItem(path=file)
return xbmcplugin.setResolvedUrl(thisPlugin, True, listitem)
-
+
def showEpisodeSpringboadAfterResolve(videoItem):
_regex_extractVideoParameters =
re.compile("http://cms\.springboard.*\.com/(.*?)/(.*?)/video/(.*?)/.*?/(.*?)")
_regex_extractVideoParameters2 =
re.compile("http\://cms\.springboardplatform\.com/xml_feeds_advanced/(.*?)/(.*?)/rss3/(.*?)/")
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c8a2e9e3ff65897dc903d83b4a132d7b88ea171d
commit c8a2e9e3ff65897dc903d83b4a132d7b88ea171d
Author: sphere <[email protected]>
Date: Wed Mar 5 09:00:05 2014 +0100
[plugin.video.gamestar] updated to version 0.1.5
diff --git a/plugin.video.gamestar/addon.xml b/plugin.video.gamestar/addon.xml
index e75195f..2e28c7c 100644
--- a/plugin.video.gamestar/addon.xml
+++ b/plugin.video.gamestar/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.gamestar"
- version="0.1.4"
+ version="0.1.5"
name="GamestarVideo"
- provider-name="Raptor 2101 [[email protected]]">
+ provider-name="Raptor 2101">
<requires>
- <import addon="xbmc.python" version="2.0"/>
+ <import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension
point="xbmc.python.pluginsource"
@@ -35,5 +35,10 @@
</description>
<platform>all</platform>
<language>de</language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+ <forum>https://github.com/raptor2101/Gamestar/issues</forum>
+ <website>https://github.com/raptor2101/Gamestar</website>
+ <source>https://github.com/raptor2101/Gamestar</source>
+ <email>[email protected]</email>
</extension>
</addon>
diff --git a/plugin.video.gamestar/changelog.txt
b/plugin.video.gamestar/changelog.txt
index 53f8e46..5c05176 100644
--- a/plugin.video.gamestar/changelog.txt
+++ b/plugin.video.gamestar/changelog.txt
@@ -1,3 +1,4 @@
+0.1.5 - Adopt newly changes from gamestar.de
0.1.4 - Adopt newly changes from gamestar.de
0.1.3 - Adopt change from gamestar.de
0.1.2 - Rewrite the Gamepro part
diff --git a/plugin.video.gamestar/gamestar.py
b/plugin.video.gamestar/gamestar.py
index 11d8188..034fe9d 100644
--- a/plugin.video.gamestar/gamestar.py
+++ b/plugin.video.gamestar/gamestar.py
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import urllib, re, time;
+import urllib, re, time,traceback;
from ui import *;
class GamestarWeb(object):
@@ -36,7 +36,7 @@ class GamestarWeb(object):
self._regEx_extractTargetLink = re.compile(self.linkRegex);
self._regEx_extractVideoID = re.compile("\\d*.html");
self._regEx_extractVideoLink = re.compile("http.*(mp4|flv)");
- self._regEx_extractPictureLink = re.compile("http://.*.jpg";);
+ self._regEx_extractPictureLink = re.compile("(http://|//).*.jpg");
self._regEx_extractHeader = re.compile(self.headerRegex);
self._regEx_extractSimpleLink = re.compile(self.simpleLinkRegex);
self._regEx_extractTitle = re.compile(self.titleRegex);
@@ -83,7 +83,11 @@ class GamestarWeb(object):
try:
videoObjects.append(self.loadVideoPage(header, videoID));
except:
- pass;
+ self.gui.log("something goes wrong while processing "+videoID);
+ self.gui.log("Exception: ");
+ traceback.print_exc();
+ self.gui.log("Stacktrace: ");
+ traceback.print_stack();
return videoObjects;
@@ -92,7 +96,10 @@ class GamestarWeb(object):
configDoc =
self.loadPage(self.rootLink+"/emb/getVideoData.cfm?vid="+videoID);
videoLink =
unicode(self._regEx_extractVideoLink.search(configDoc).group());
videoLink = self.replaceXmlEntities(videoLink);
- thumbnailLink
=unicode(self._regEx_extractPictureLink.search(configDoc).group());
+ thumbnailLink = self._regEx_extractPictureLink.search(configDoc).group();
+ if(not thumbnailLink.startswith('http://')):
+ thumbnailLink = thumbnailLink.replace("//",'http://');
+ thumbnailLink = unicode(thumbnailLink);
return VideoObject(title, videoLink, thumbnailLink, self.shortName);
diff --git a/plugin.video.gamestar/resources/language/English/strings.xml
b/plugin.video.gamestar/resources/language/English/strings.xml
index d2c6d2d..6dcf80a 100644
--- a/plugin.video.gamestar/resources/language/English/strings.xml
+++ b/plugin.video.gamestar/resources/language/English/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30000">Youtube</string>
<string id="30001">Newest videos</string>
diff --git a/plugin.video.gamestar/resources/language/German/strings.xml
b/plugin.video.gamestar/resources/language/German/strings.xml
index 44c71b1..b4df90c 100644
--- a/plugin.video.gamestar/resources/language/German/strings.xml
+++ b/plugin.video.gamestar/resources/language/German/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30000">Youtube</string>
<string id="30001">Neuste videos</string>
diff --git a/plugin.video.gamestar/resources/settings.xml
b/plugin.video.gamestar/resources/settings.xml
index 6f8a4cd..3430934 100644
--- a/plugin.video.gamestar/resources/settings.xml
+++ b/plugin.video.gamestar/resources/settings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<setting id="gamestar" type="bool" label="30100" option="writeable"
default="true"/>
<setting id="gamepro" type="bool" label="30101" option="writeable"
default="true"/>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.cinemassacre/addon.xml | 2 +-
plugin.video.cinemassacre/changelog.txt | 1 +
plugin.video.cinemassacre/showEpisode.py | 27 ++++---------------
.../LICENSE.txt | 0
plugin.video.gamestar/addon.xml | 11 ++++++--
plugin.video.gamestar/changelog.txt | 1 +
plugin.video.gamestar/gamestar.py | 15 ++++++++---
plugin.video.gamestar/icon.png | Bin 45926 -> 45926 bytes
.../resources/language/English/strings.xml | 1 +
.../resources/language/German/strings.xml | 1 +
plugin.video.gamestar/resources/settings.xml | 1 +
11 files changed, 31 insertions(+), 29 deletions(-)
copy {plugin.video.mediathek => plugin.video.gamestar}/LICENSE.txt (100%)
mode change 100755 => 100644 plugin.video.gamestar/icon.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://.*.jpg"](http://.*.jpg"){kind=link}