The branch, eden-pre has been updated
via 38d7fb2bb3dbe205bbbeb8c6f08215fdc936cddc (commit)
from ade502ecbcaa87470ac70a6a63786a3a5638c369 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=38d7fb2bb3dbe205bbbeb8c6f08215fdc936cddc
commit 38d7fb2bb3dbe205bbbeb8c6f08215fdc936cddc
Author: spiff <[email protected]>
Date: Tue Oct 18 09:49:17 2011 +0200
[plugin.video.mediathek] updated to version 0.3.6
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index a3f33ef..c134009 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.3.5"
+ version="0.3.6"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index d0b9eab..1c76bb9 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.3.6 - FIX: WDR
0.3.5 - FIX: BayernFS
0.3.4 - FIX: ARTE
0.3.3 - ADD: BR-Alpha
diff --git a/plugin.video.mediathek/mediathek/__init__.py
b/plugin.video.mediathek/mediathek/__init__.py
index 26ad24f..bd11f02 100644
--- a/plugin.video.mediathek/mediathek/__init__.py
+++ b/plugin.video.mediathek/mediathek/__init__.py
@@ -34,7 +34,7 @@ class TreeNode(object):
def __init__(self,path,name,link,displayElements,childNodes = []):
self.name = name;
self.path = path;
- self.link = urllib.unquote_plus(link);
+ self.link = link;
self.displayElements = displayElements;
self.childNodes = childNodes;
diff --git a/plugin.video.mediathek/mediathek/bayerisches.py
b/plugin.video.mediathek/mediathek/bayerisches.py
index c958b7b..425ad04 100644
--- a/plugin.video.mediathek/mediathek/bayerisches.py
+++ b/plugin.video.mediathek/mediathek/bayerisches.py
@@ -107,7 +107,7 @@ class BayerischesFSMediathek(Mediathek):
print("Error Downloading ZIP");
return '';
- for fileName in zipf.infolist():
+ for fileName in zipf.namelist():
return zipf.read(fileName);
def parseDate(self,dateString):
diff --git a/plugin.video.mediathek/mediathek/wdr.py
b/plugin.video.mediathek/mediathek/wdr.py
index 64d022a..440895b 100644
--- a/plugin.video.mediathek/mediathek/wdr.py
+++ b/plugin.video.mediathek/mediathek/wdr.py
@@ -139,7 +139,7 @@ class WDRMediathek(Mediathek):
def buildPageMenu(self, link, initCount, subLink = False):
- self.gui.log(link);
+ self.gui.log("MenuLink: %s"%link);
mainPage = self.loadPage(link);
if(mainPage.startswith("<?xml version=\"1.0\"")):
@@ -192,15 +192,22 @@ class WDRMediathek(Mediathek):
linkString = linkString.group();
if linkString.startswith("dslSrc="):
linkString = linkString.replace("dslSrc=","");
- links[1] = SimpleLink(linkString, 0);
else:
linkString = linkString.replace("isdnSrc=","");
- links[0] = SimpleLink(linkString, 0);
+ links[0] = self.extractLink(linkString);
if len(links) == 0:
linkString = self._regex_extractAudioLink.search(mainPage).group();
- links[0] = SimpleLink(linkString, 0);
+ links[0] = self.extractLink(linkString);
return DisplayObject(title,"",picture,description,links,True, date)
-
\ No newline at end of file
+ def extractLink(self, linkString):
+ if(linkString.find("mediartmp://")>-1):
+ linkString = linkString.split("mediartmp://")
+ return SimpleLink("rtmp://%s"%linkString[1], 0);
+ elif(linkString.find("mediahttp://";)>-1):
+ linkString = linkString.split("mediahttp://";)
+ return SimpleLink("http://%s"%linkString[1], 0);
+ else:
+ return SimpleLink(linkString, 0);
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/__init__.py | 2 +-
plugin.video.mediathek/mediathek/bayerisches.py | 2 +-
plugin.video.mediathek/mediathek/wdr.py | 17 ++++++++++++-----
5 files changed, 16 insertions(+), 8 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
