The branch, dharma has been updated
via 05a72bb21214bd86bd686498772c919907318301 (commit)
from 82d92f6966e42810fd65569947f5b32f64c8c450 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=05a72bb21214bd86bd686498772c919907318301
commit 05a72bb21214bd86bd686498772c919907318301
Author: spiff <[email protected]>
Date: Fri May 27 21:54:23 2011 +0200
[plugin.video.mediathek] updated to version 0.2.1
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index bf9e6e1..d9c23ce 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.0"
+ version="0.2.1"
name="Mediathek"
provider-name="Raptor 2101 [[email protected]]">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 5fa0b1b..1bb7c08 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,5 @@
+0.2.1 - ADD: PageNavigation for ZDF
+ FIX: ChannelLogos fixed
0.2.0 - FIX: Minor Bugfixes
0.1.9 - FIX: ORF Playback
FIX: Progressbar is displayed corectly
diff --git a/plugin.video.mediathek/mediathek/zdf.py
b/plugin.video.mediathek/mediathek/zdf.py
index 62b9581..2157197 100644
--- a/plugin.video.mediathek/mediathek/zdf.py
+++ b/plugin.video.mediathek/mediathek/zdf.py
@@ -85,6 +85,8 @@ class ZDFMediathek(Mediathek):
self.regex_topicPageLink =
"/ZDFmediathek/((kanaluebersicht/aktuellste/\\d+.*)|(hauptnavigation/nachrichten/ganze-sendungen.*))flash=off";
self._regex_extractTopicObject = re.compile("<li.*\\s*<div
class=\"image\">\\s*<a href=\""+self.regex_topicPageLink+"\">\\s*<img
src=\""+regex_imageLink+"\" title=\".*\" alt=\".*\"/>\\s*</a>\\s*</div>\\s*<div
class=\"text\">\\s*<p( class=\".*\"){0,1}>\\s*<a
href=\""+self.regex_topicPageLink+"\"(
class=\"orangeUpper\"){0,1}>.*</a>\\s*</p>\\s*<p>\\s*<b>\\s*<a
href=\""+self.regex_topicPageLink+"\">\\s*.*</a>");
+ self._regex_extractPageNavigation = re.compile("<a
href=\""+self.regex_topicPageLink+"\" .*>.*?</a>");
+
self._regex_extractPictureLink = re.compile(regex_imageLink);
self._regex_extractPicSize = re.compile("\\d{2,4}x\\d{2,4}");
@@ -127,13 +129,27 @@ class ZDFMediathek(Mediathek):
topicPageLinks = list(self._regex_extractTopicObject.finditer(mainPage));
videoPageLinks = list(self._regex_extractVideoPageLink.finditer(mainPage));
+ pageNavigation =
list(self._regex_extractPageNavigation.finditer(mainPage));
self.initCount = initCount;
- self.countTopic = len(topicPageLinks);
+ self.countTopic = len(topicPageLinks)+len(pageNavigation);
self.countVideo = len(videoPageLinks);
self.extractTopicObjects(topicPageLinks);
self.extractVideoObjects(videoPageLinks);
+ self.extractPageNavigation(pageNavigation);
+
+ def extractPageNavigation(self, links):
+ for element in links:
+ element = element.group()
+
+ title = self._regex_extractTopicTitle.search(element).group();
+ title = unicode(title,'UTF-8');
+ title = self.replace_html.sub("", title); #outerhtml wegschneiden
+ title = title.replace(" ", ""); #sinnlose "steuerzeichen
wegschneiden"
+
+ videoPageLink =
self.rootLink+self._regex_extractTopicPageLink.search(element).group();
+
self.gui.buildVideoLink(DisplayObject(title,"","","",videoPageLink,False),self,self.getItemCount());
def getItemCount(self):
return self.initCount + self.countTopic + self.countVideo;
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 2 ++
plugin.video.mediathek/mediathek/zdf.py | 18 +++++++++++++++++-
plugin.video.mediathek/resources/logos/3Sat.jpg | Bin 0 -> 5364 bytes
.../resources/logos/{ard.jpg => ARD.jpg} | Bin 3418 -> 3418 bytes
.../resources/logos/{arte.jpeg => ARTE.jpg} | Bin 3962 -> 3962 bytes
.../resources/logos/BayernFS.jpg | Bin 0 -> 8524 bytes
plugin.video.mediathek/resources/logos/ORF.jpg | Bin 0 -> 3012 bytes
.../resources/logos/{zdf.jpg => ZDF.jpg} | Bin 8180 -> 8180 bytes
9 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 plugin.video.mediathek/resources/logos/3Sat.jpg
rename plugin.video.mediathek/resources/logos/{ard.jpg => ARD.jpg} (100%)
rename plugin.video.mediathek/resources/logos/{arte.jpeg => ARTE.jpg} (100%)
create mode 100644 plugin.video.mediathek/resources/logos/BayernFS.jpg
create mode 100644 plugin.video.mediathek/resources/logos/ORF.jpg
rename plugin.video.mediathek/resources/logos/{zdf.jpg => ZDF.jpg} (100%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
