The branch, dharma has been updated
via 82f3ff8fbbffd7d71b887dc91105835ee1e88c5b (commit)
via c76a4ae5bf9fecb84378cb6a31c07e11fb731ef0 (commit)
from 04c83b98219f337966fd35f4ed45976d6f062c74 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=82f3ff8fbbffd7d71b887dc91105835ee1e88c5b
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c76a4ae5bf9fecb84378cb6a31c07e11fb731ef0
commit c76a4ae5bf9fecb84378cb6a31c07e11fb731ef0
Author: spiff <[email protected]>
Date: Mon Oct 3 09:12:52 2011 +0200
[plugin.video.mediathek] updated to version 0.2.5
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index e0e9c30..70d0e33 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.2.4"
+ version="0.2.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 2003087..090ea35 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.2.5 - FIX: BayernFS
0.2.4 - FIX: ARTE
0.2.3 - ADD: BR-Alpha
0.2.2 - ADD: WDR Mediathek
diff --git a/plugin.video.mediathek/mediathek/bayerisches.py
b/plugin.video.mediathek/mediathek/bayerisches.py
index 8d10141..c958b7b 100644
--- a/plugin.video.mediathek/mediathek/bayerisches.py
+++ b/plugin.video.mediathek/mediathek/bayerisches.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 re,time
+import re,time,traceback
import zipfile
import StringIO
from mediathek import *
@@ -38,8 +38,9 @@ class BayerischesFSMediathek(Mediathek):
else:
self.baseType = "rtsp_mov_http"
-
self.root_url="http://rd.gl-systemhaus.de/br/b7/archive/archive.xml.zip.adler32";
-
+ self.root_url="http://mediathek-video.br.de/js/config.js";;
+
self.regexp_findArchive=re.compile("http://.*/archive/archive\.xml\.zip\.adler32";);
+
self.menuTree = (
TreeNode("0","Alle","http://LoadAll",True),
);
@@ -49,7 +50,7 @@ class BayerischesFSMediathek(Mediathek):
self.gui.log("buildPageMenu: "+link);
a=self.loadAndUnzip();
-
+ print a
try:
self.xml_cont = minidom.parseString(a);
except:
@@ -73,8 +74,10 @@ class BayerischesFSMediathek(Mediathek):
return "";
def loadAndUnzip(self):
-
- req = urllib2.Request(self.root_url)
+ configDoc = self.loadPage(self.root_url)
+ archiveLink = self.regexp_findArchive.search(configDoc).group();
+
+ req = urllib2.Request(archiveLink);
req.add_header('User-Agent', 'Mozilla/5.0')
req.add_header('Accept',
'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')
req.add_header('Accept-Language', 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3')
@@ -82,7 +85,7 @@ class BayerischesFSMediathek(Mediathek):
waittime = 2;
doc = False;
- self.gui.log("loadAndUnzip: download %s"%(self.root_url));
+ self.gui.log("loadAndUnzip: download %s"%(archiveLink));
while not doc and waittime < 60:
try:
@@ -103,8 +106,9 @@ class BayerischesFSMediathek(Mediathek):
except:
print("Error Downloading ZIP");
return '';
-
- return zipf.read("archive.xml");
+
+ for fileName in zipf.infolist():
+ return zipf.read(fileName);
def parseDate(self,dateString):
return time.strptime(dateString,"%Y-%m-%dT%H:%M:%S");
@@ -138,6 +142,7 @@ class BayerischesFSMediathek(Mediathek):
try:
videos = itemNode.getElementsByTagName("videos")[0];
if not videos.hasChildNodes():
+ print "no videos";
return None;
for videotag in videos.getElementsByTagName("video"):
@@ -152,6 +157,11 @@ class BayerischesFSMediathek(Mediathek):
if (videotag.attributes["groesse"].value == "xlarge"):
links[2] = SimpleLink(link+videotag.attributes["stream"].value, 0);
except:
+ self.gui.log("Exception: ");
+ traceback.print_exc();
+ self.gui.log("Stacktrace: ");
+ traceback.print_stack();
+
return None;
return DisplayObject(title,subtitle,picture,description,links,True,
pubDate)
diff --git a/plugin.video.mediathek/mediathek/zdf.py
b/plugin.video.mediathek/mediathek/zdf.py
index 2cdf2ba..d152faa 100644
--- a/plugin.video.mediathek/mediathek/zdf.py
+++ b/plugin.video.mediathek/mediathek/zdf.py
@@ -298,7 +298,7 @@ class ZDFMediathek(Mediathek):
for element in pageLinks:
element = element.group()
pictureLink = self.rootLink +
self._regex_extractPictureLink.search(element).group();
- videoPageLink =
self.rootLink+self._regex_extractTopicPageLink.search(element).group();
+ videoPageLink = self.rootLink +
self._regex_extractTopicPageLink.search(element).group();
titles = [];
for title in self._regex_extractTopicTitle.findall(element):
title = unicode(title,'UTF-8');
-----------------------------------------------------------------------
Summary of changes:
.../LICENSE.txt | 0
{plugin.video.wimp => plugin.video.dump}/addon.xml | 10 +-
plugin.video.dump/changelog.txt | 6 +
plugin.video.dump/default.py | 262 ++++++++++++++++++++
plugin.video.dump/icon.png | Bin 0 -> 10209 bytes
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/bayerisches.py | 28 ++-
plugin.video.mediathek/mediathek/zdf.py | 2 +-
9 files changed, 295 insertions(+), 16 deletions(-)
copy {plugin.audio.hvsc => plugin.video.dump}/LICENSE.txt (100%)
copy {plugin.video.wimp => plugin.video.dump}/addon.xml (62%)
create mode 100644 plugin.video.dump/changelog.txt
create mode 100644 plugin.video.dump/default.py
create mode 100644 plugin.video.dump/icon.png
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-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
