The branch, frodo has been updated
via 26032c28a3f53f18ea75a839ddfcc4c20878f70f (commit)
via 503e3ae879b69b4ba7594282d7562eaf4daa2328 (commit)
from f87b7aeee00a1da4204c354e776858fe152d3410 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=26032c28a3f53f18ea75a839ddfcc4c20878f70f
commit 26032c28a3f53f18ea75a839ddfcc4c20878f70f
Author: beenje <[email protected]>
Date: Thu May 30 21:43:58 2013 +0200
[plugin.video.mediathek] updated to version 0.5.5
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index a6125e8..1f2f801 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.mediathek"
- version="0.5.4"
+ version="0.5.5"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 8040656..01554ed 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.5.5 - FIX: More NDR fixes
0.5.4 - FIX: NDR Fixed by dethfeet
0.5.2 - FIX: adopt some specialities in the ARD Format
0.5.2 - FIX: Get all ARD features back working
diff --git a/plugin.video.mediathek/mediathek/ndr.py
b/plugin.video.mediathek/mediathek/ndr.py
index a23247b..575480e 100644
--- a/plugin.video.mediathek/mediathek/ndr.py
+++ b/plugin.video.mediathek/mediathek/ndr.py
@@ -50,7 +50,8 @@ class NDRMediathek(Mediathek):
self.searchLink =
self.rootLink+"/mediathek/mediatheksuche101.html?pagenumber=1&search_video=true&"
- self.regex_extractVideoLink =
re.compile("rtmpt://ndr.fcod.llnwd.net/a3715/d1/flashmedia/streams/ndr/(.*\\.)(hi.mp4|lo.flv)");
+ self.regex_extractVideoLink =
re.compile("rtmpt://ndr.fcod.llnwd.net/a3715/d1/flashmedia/streams/ndr/(.*\\.)(hi.mp4|lo.flv)");
+
#self.rtmpBaseLink =
"rtmpt://ndr.fcod.llnwd.net/a3715/d1/flashmedia/streams/ndr/";
self.rtmpBaseLink =
"rtmp://cp160844.edgefcs.net/ondemand/flashmedia/streams/ndr/";
@@ -91,8 +92,11 @@ class NDRMediathek(Mediathek):
for videoItem in videoItems:
videoID = regex_extractVideoItemHref.search(videoItem).group(1)
- dateString = regex_extractVideoItemDate.search(videoItem).group(1)
- dateTime = time.strptime(dateString,"%d.%m.%Y %H:%M");
+ try:
+ dateString = regex_extractVideoItemDate.search(videoItem).group(1)
+ dateTime = time.strptime(dateString,"%d.%m.%Y %H:%M");
+ except:
+ dateTime = None;
self.extractVideoInformation(videoID,dateTime,nodeCount)
#Pagination (weiter)
@@ -161,7 +165,7 @@ class NDRMediathek(Mediathek):
videoNode = videoNode.getElementsByTagName("video")[0]
title = self.readText(videoNode,"headline");
description = self.readText(videoNode,"teaser");
- duration = self.readText(videoNode,"duration");
+ duration = self.readText(videoNode,"duration")[:2];
imageNode =
videoNode.getElementsByTagName("images")[0].getElementsByTagName("image")
if len(imageNode):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=503e3ae879b69b4ba7594282d7562eaf4daa2328
commit 503e3ae879b69b4ba7594282d7562eaf4daa2328
Author: beenje <[email protected]>
Date: Thu May 30 21:43:56 2013 +0200
[plugin.video.gamekings] updated to version 1.0.2
diff --git a/plugin.video.gamekings/LICENSE.txt
b/plugin.video.gamekings/LICENSE.txt
index 94a9ed0..f71b0cf 100644
--- a/plugin.video.gamekings/LICENSE.txt
+++ b/plugin.video.gamekings/LICENSE.txt
@@ -672,3 +672,4 @@ may consider it more useful to permit linking proprietary
applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
\ No newline at end of file
diff --git a/plugin.video.gamekings/addon.py b/plugin.video.gamekings/addon.py
index 561fccf..3e7d754 100644
--- a/plugin.video.gamekings/addon.py
+++ b/plugin.video.gamekings/addon.py
@@ -17,8 +17,8 @@
#
#also in ..._const
__addon__ = "plugin.video.gamekings"
-__date__ = "10 april 2013"
-__version__ = "1.0.1"
+__date__ = "29 may 2013"
+__version__ = "1.0.2"
#
# Imports
diff --git a/plugin.video.gamekings/addon.xml b/plugin.video.gamekings/addon.xml
index 508fe69..812c882 100644
--- a/plugin.video.gamekings/addon.xml
+++ b/plugin.video.gamekings/addon.xml
@@ -2,7 +2,7 @@
<addon
id="plugin.video.gamekings"
name="GameKings"
- version="1.0.1"
+ version="1.0.2"
provider-name="Skipmode A1">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.gamekings/changelog.txt
b/plugin.video.gamekings/changelog.txt
index 2085da4..56d07b4 100644
--- a/plugin.video.gamekings/changelog.txt
+++ b/plugin.video.gamekings/changelog.txt
@@ -11,5 +11,6 @@ v1.0.1 (Wednesday, 10 april 2013) :
- filled in optional fields in addon.xml
- used title attribute more if possible
-
+v1.0.2 (Wednesday, 29 may 2013) :
+- sometimes the video-url in the content-tag is not (!) correct, in that case
trying with added '/large' in the video-url
\ No newline at end of file
diff --git a/plugin.video.gamekings/resources/lib/gamekings_const.py
b/plugin.video.gamekings/resources/lib/gamekings_const.py
index 3235199..e5d54e4 100644
--- a/plugin.video.gamekings/resources/lib/gamekings_const.py
+++ b/plugin.video.gamekings/resources/lib/gamekings_const.py
@@ -8,5 +8,5 @@ __addon__ = "plugin.video.gamekings"
__settings__ = xbmcaddon.Addon(id=__addon__ )
__language__ = __settings__.getLocalizedString
__images_path__ = os.path.join( xbmcaddon.Addon(id=__addon__
).getAddonInfo('path'), 'resources', 'images' )
-__date__ = "10 april 2013"
-__version__ = "1.0.1"
\ No newline at end of file
+__date__ = "29 may 2013"
+__version__ = "1.0.2"
\ No newline at end of file
diff --git a/plugin.video.gamekings/resources/lib/gamekings_play.py
b/plugin.video.gamekings/resources/lib/gamekings_play.py
index 7304f9d..7cb29fc 100644
--- a/plugin.video.gamekings/resources/lib/gamekings_play.py
+++ b/plugin.video.gamekings/resources/lib/gamekings_play.py
@@ -83,6 +83,8 @@ class Main:
# Get the video url
#<meta property="og:video"
content="http://stream.gamekings.tv/20130306_SpecialForces.mp4"/>
+ #sometimes the content is not (!!) correct and the real link
will be "http://stream.gamekings.tv/large/20130529_E3Journaal.mp4"; :(
+
video_urls = soup.findAll('meta', attrs={'content':
re.compile("^http://stream.gamekings.tv/";)}, limit=1)
if (self.DEBUG) == 'true':
@@ -91,13 +93,17 @@ class Main:
if len(video_urls) == 0:
no_url_found = True
else:
- video_url = video_urls[0]['content']
+ video_url = str(video_urls[0]['content'])
if (self.DEBUG) == 'true':
xbmc.log( "[ADDON] %s v%s (%s) debug mode, %s =
%s" % ( __addon__, __version__, __date__, "video_url", str(video_url) ),
xbmc.LOGNOTICE )
if httpCommunicator.exists( video_url ):
have_valid_url = True
else:
- unplayable_media_file = True
+ video_url =
video_url.replace("http://stream.gamekings.tv/";,
"http://stream.gamekings.tv/large/";)
+ if httpCommunicator.exists( video_url ):
+ have_valid_url = True
+ else:
+ unplayable_media_file = True
# Play video
if have_valid_url:
diff --git a/plugin.video.gamekings/resources/settings.xml
b/plugin.video.gamekings/resources/settings.xml
index de33972..9c5a5bd 100644
--- a/plugin.video.gamekings/resources/settings.xml
+++ b/plugin.video.gamekings/resources/settings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<setting id="debug" label="30400" type="bool"
default="false"/>
-</settings>
+</settings>
diff --git a/plugin.video.gamekings/todo.txt b/plugin.video.gamekings/todo.txt
index 14942b4..d203377 100644
--- a/plugin.video.gamekings/todo.txt
+++ b/plugin.video.gamekings/todo.txt
@@ -1,2 +1,2 @@
- Showing videos in the category Nieuws (without having to check whether each
page contains a video or not)
-- Some older episodes won't play, figure out why not and what to do about it
\ No newline at end of file
+- Some older episodes won't play, figure out why not and what to do about it
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.gamekings/LICENSE.txt | 1 +
plugin.video.gamekings/addon.py | 4 ++--
plugin.video.gamekings/addon.xml | 2 +-
plugin.video.gamekings/changelog.txt | 3 ++-
.../resources/lib/gamekings_const.py | 4 ++--
.../resources/lib/gamekings_play.py | 10 ++++++++--
plugin.video.gamekings/resources/settings.xml | 2 +-
plugin.video.gamekings/todo.txt | 2 +-
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/ndr.py | 12 ++++++++----
11 files changed, 28 insertions(+), 15 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
