The branch, eden has been updated
via 471b17b1ad67d472a97480b97fcbc8dbd2bb1a5d (commit)
via c1ac41d8e762436c3caa406268a50433fd276b4a (commit)
from cdde3562eb47f243fbd431a3edee6bccc0a2522a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=471b17b1ad67d472a97480b97fcbc8dbd2bb1a5d
commit 471b17b1ad67d472a97480b97fcbc8dbd2bb1a5d
Author: Martijn Kaijser <[email protected]>
Date: Wed May 23 23:46:53 2012 +0200
[plugin.video.mediathek] update to 0.4.3
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index b6c084d..3a7d07c 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.4.2"
+ version="0.4.3"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
@@ -23,6 +23,7 @@ Aktuell implementiert sind:
Currently implemented:
3Sat, ARD, ZDF, ARTE, Bayrisches Fernsehen, ORF, WDR, NDR, KiKa (without
Kikaninchen)
</description>
+ <language>de</language>
<platform>all</platform>
</extension>
</addon>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 484756a..b472fae 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.4.3 - FIX: NDR streams / NDR changed their streaming adresses by soern
0.4.2 - FIX: WDR add search function, add stream duration, add "pageSize"
optioni (Soern)
FIX: bayrisches FS podcasts eingefügt, Auswahl nach Sendungen, Suche
(Soern)
0.4.1 - FIX: Soern completed the NDR implementation
diff --git a/plugin.video.mediathek/mediathek/ndr.py
b/plugin.video.mediathek/mediathek/ndr.py
index e240e3c..d02fcce 100644
--- a/plugin.video.mediathek/mediathek/ndr.py
+++ b/plugin.video.mediathek/mediathek/ndr.py
@@ -49,8 +49,10 @@ class NDRMediathek(Mediathek):
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.mmsBaseLink = "mms://ndr.wmod.llnwd.net/a3715/d1/msmedia/";
+ #self.rtmpBaseLink =
"rtmpt://ndr.fcod.llnwd.net/a3715/d1/flashmedia/streams/ndr/";
+ self.rtmpBaseLink =
"rtmp://cp160844.edgefcs.net/ondemand/flashmedia/streams/ndr/";
+ #self.mmsBaseLink = "mms://ndr.wmod.llnwd.net/a3715/d1/msmedia/";
+ self.mmsBaseLink =
"mms://a874.v1608102.c160810.g.vm.akamaistream.net/7/874/160810/v0001/wm.origin.ndr.gl-systemhaus.de/msmedia/";
self.httpBaseLink = "http://media.ndr.de/progressive/";;
self.menuTree = [
diff --git a/plugin.video.mediathek/mediathek/zdf.py
b/plugin.video.mediathek/mediathek/zdf.py
index 3f1bce4..501ccd8 100644
--- a/plugin.video.mediathek/mediathek/zdf.py
+++ b/plugin.video.mediathek/mediathek/zdf.py
@@ -162,11 +162,14 @@ class ZDFMediathek(Mediathek):
videoID = self._regex_extractVideoID.search(pageLink.group()).group();
videoID = videoID.replace("/","");
if(not lastID == videoID):
+ self.gui.log("append VideoID: %s len: %d"%(videoID,len(videos)));
videos.append(videoID);
lastID = videoID;
self.countVideo = len(videos);
+ self.gui.log("len %d"%(len(videos)));
for videoID in videos:
+ self.gui.log("decode VideoID: %s"%(videoID));
self.loadConfigXml(videoID);
def loadConfigXml(self, videoID):
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c1ac41d8e762436c3caa406268a50433fd276b4a
commit c1ac41d8e762436c3caa406268a50433fd276b4a
Author: Martijn Kaijser <[email protected]>
Date: Wed May 23 23:45:10 2012 +0200
[plugin.audio.podcatcher] update to 0.1.7
diff --git a/plugin.audio.podcatcher/addon.xml
b/plugin.audio.podcatcher/addon.xml
index caac4ae..d4bb1d9 100644
--- a/plugin.audio.podcatcher/addon.xml
+++ b/plugin.audio.podcatcher/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.audio.podcatcher"
- version="0.1.6"
+ version="0.1.7"
name="AudioPodcatcher"
provider-name="Raptor 2101 [[email protected]]">
<requires>
@@ -24,6 +24,7 @@
A Plugin to listen and organize podcast.
IMPORTANT: This plugins needs a user-generated opml.xml to be runable.
Please read the README-File first.
</description>
+ <language>de</language>
<platform>all</platform>
</extension>
</addon>
diff --git a/plugin.audio.podcatcher/changelog.txt
b/plugin.audio.podcatcher/changelog.txt
index 25e591c..65e0bfe 100644
--- a/plugin.audio.podcatcher/changelog.txt
+++ b/plugin.audio.podcatcher/changelog.txt
@@ -1,3 +1,4 @@
+version 0.1.7 - FIX: Error while parsing datetime
version 0.1.6 - FIX: Minor Bugfixes
version 0.1.5 - FIX: Minor Bugfixes
version 0.1.4 - FIX: Bugfixing/Thumbnails from divestoclimb
diff --git a/plugin.audio.podcatcher/feedreader/__init__.py
b/plugin.audio.podcatcher/feedreader/__init__.py
index 647e68c..47d52e9 100644
--- a/plugin.audio.podcatcher/feedreader/__init__.py
+++ b/plugin.audio.podcatcher/feedreader/__init__.py
@@ -18,6 +18,7 @@
import time,urllib,re;
from archivefile import ArchiveFile
regex_mediaLink = re.compile("(http|ftp)://.*?\\.(mp3|mpeg|asx|wmv|ogg|mov)");
+regex_dateStringShortYear = re.compile("\\d{2} ((\\w{3,})|(\\d{2})) \\d{2}");
regex_dateString = re.compile("\\d{2} ((\\w{3,})|(\\d{2})) \\d{4}");
regex_shortdateString = re.compile("\\d{4}-(\\d{2})-\\d{2}");
regex_replaceUnusableChar = re.compile("[:/ \\.\?\\\\]")
@@ -226,7 +227,17 @@ class Feed(object):
if(dateMatch is not None):
dateString = dateMatch.group();
return time.strptime(dateString,"%Y-%m-%d");
- return 0;
+ else:
+ dateMatch = regex_dateStringShortYear.search(dateString)
+ if(dateMatch is not None):
+ dateString = dateMatch.group();
+ for month in month_replacements_long.keys():
+ dateString =
dateString.replace(month,month_replacements_long[month]);
+ for month in month_replacements.keys():
+ dateString = dateString.replace(month,month_replacements[month]);
+ return time.strptime(dateString,"%d %m %y");
+
+ return time.localtime();
def writeDate(self, date):
return time.strftime("%d %m %Y",date);
diff --git a/plugin.audio.podcatcher/feedreader/rss.py
b/plugin.audio.podcatcher/feedreader/rss.py
index fdb3ba2..24a698a 100644
--- a/plugin.audio.podcatcher/feedreader/rss.py
+++ b/plugin.audio.podcatcher/feedreader/rss.py
@@ -58,7 +58,10 @@ class RssFeed (Feed):
enclosureNode = itemNode.getElementsByTagName("enclosure")[0];
feedItem.link = enclosureNode.getAttribute("url");
- feedItem.size = int(enclosureNode.getAttribute("length"));
+ try:
+ feedItem.size = int(enclosureNode.getAttribute("length"));
+ except:
+ feedItem.size = 0;
else:
feedItem.size = 0;
feedItem.link =
self.parseIndirectItem(self.readText(itemNode,"link"));
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.podcatcher/addon.xml | 3 ++-
plugin.audio.podcatcher/changelog.txt | 1 +
plugin.audio.podcatcher/feedreader/__init__.py | 13 ++++++++++++-
plugin.audio.podcatcher/feedreader/rss.py | 5 ++++-
plugin.video.mediathek/addon.xml | 3 ++-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/ndr.py | 6 ++++--
plugin.video.mediathek/mediathek/zdf.py | 3 +++
8 files changed, 29 insertions(+), 6 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
