The branch, frodo has been updated
via c28af05016c53757e78b299ce90fa9c4e0192ac5 (commit)
from 73083a4844dc2457b68a39ab6cd9c045ee55fd64 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=c28af05016c53757e78b299ce90fa9c4e0192ac5
commit c28af05016c53757e78b299ce90fa9c4e0192ac5
Author: Martijn Kaijser <[email protected]>
Date: Fri Jun 13 09:03:41 2014 +0200
[plugin.video.mediathek] 0.6.3
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index 8152f86..b6b1915 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.6.2"
+ version="0.6.3"
name="Mediathek"
provider-name="Raptor 2101">
<requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index ead9c8d..7c82adc 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.6.3 - FIX: extend ARD plugin
0.6.2 - FIX: adopt ARD infrastructure change
0.6.1 - FIX: adopt NDR infrastructure change
0.6.0 - FIX: Regexp for crawling the ARD-Mediathek
diff --git a/plugin.video.mediathek/mediathek/ard.py
b/plugin.video.mediathek/mediathek/ard.py
index dbd593f..d835923 100644
--- a/plugin.video.mediathek/mediathek/ard.py
+++ b/plugin.video.mediathek/mediathek/ard.py
@@ -53,12 +53,22 @@ class ARDMediathek(Mediathek):
TreeNode("1.25","Y",self.rootLink+"/tv/sendungen-a-z?buchstabe=Y",True),
TreeNode("1.26","Z",self.rootLink+"/tv/sendungen-a-z?buchstabe=Z",True),
)),
+ TreeNode("2","Reportagen und
Dokus",self.rootLink+"/tv/Reportage-Doku/mehr?documentId=21301806",True),
+
TreeNode("3","Film-Highlights",self.rootLink+"/tv/Film-Highlights/mehr?documentId=21301808",True),
+ TreeNode("4","Channels","",False,(
+
TreeNode("4.0","Kinder",self.rootLink+"/tv/Kinder-Familie/mehr?documentId=21282542",True),
+ TreeNode("4.1","Satire &
Unterhaltung",self.rootLink+"/tv/Satire-Unterhaltung/mehr?documentId=21282544",True),
+
TreeNode("4.2","Kultur",self.rootLink+"/tv/Kultur/mehr?documentId=21282546",True),
+ TreeNode("4.3","Serien &
Soaps",self.rootLink+"/tv/Serien-Soaps/mehr?documentId=21282548",True),
+
TreeNode("4.4","Wissen",self.rootLink+"/tv/Wissen/mehr?documentId=21282530",True),
+ ))
)
self.configLink =
self.rootLink+"/play/media/%s?devicetype=pc&feature=flash"
self.regex_VideoPageLink = re.compile("<a
href=\".*Video\?documentId=(\d+)&bcastId=\d+\" class=\"textLink\">\s+?<p
class=\"dachzeile\">(.*?)</p>\s+?<h4 class=\"headline\">(.*?)</h4>")
self.regex_CategoryPageLink = re.compile("<a
href=\"(.*Sendung\?documentId=\d+&bcastId=\d+)\" class=\"textLink\">\s+?<p
class=\"dachzeile\">.*?</p>\s+?<h4 class=\"headline\">(.*?)</h4>\s+?<p
class=\"subtitle\">(.*?)</p>")
-
+ self.pageSelectString = "&mcontent%s=page.%s"
+ self.regex_DetermineSelectedPage =
re.compile("&mcontents{0,1}=page.(\d+)");
self.regex_videoLinks =
re.compile("\"_quality\":(\d).*?\"_stream\":\"(.*?)\"");
self.regex_pictureLink = re.compile("_previewImage\":\"(.*?)\"");
@@ -83,8 +93,26 @@ class ARDMediathek(Mediathek):
elementCount = self.extractElements(mainPage);
+
+ self.generateNextPageElement(link, elementCount);
return elementCount;
-
+ def generateNextPageElement(self, link, elementCount):
+ marker = "";
+ if("Sendung?documentId" in link):
+ marker = "s";
+
+ numberElement = self.regex_DetermineSelectedPage.search(link);
+ if(numberElement is not None):
+ oldNumber = int(numberElement.group(1));
+ newNumber = oldNumber + 1;
+ link =
link.replace(self.pageSelectString%(marker,oldNumber),self.pageSelectString%(marker,newNumber));
+
+
self.gui.buildVideoLink(DisplayObject("Weiter","","","",link,False),self,elementCount);
+ else:
+ link += self.pageSelectString%(marker,2)
+
+
self.gui.buildVideoLink(DisplayObject("Weiter","","","",link,False),self,elementCount);
+
def extractElements(self,mainPage):
videoElements = list(self.regex_VideoPageLink.finditer(mainPage));
linkElements = list(self.regex_CategoryPageLink.finditer(mainPage));
@@ -100,6 +128,9 @@ class ARDMediathek(Mediathek):
title = element.group(2).decode('utf-8');
subTitle = element.group(3).decode('utf-8');
self.decodeVideoInformation(videoId, title, subTitle, counter);
+
+
+
return counter;
def decodeVideoInformation(self, videoId, title, subTitle, nodeCount):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 2 +-
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/ard.py | 35 +++++++++++++++++++++++++++++-
3 files changed, 35 insertions(+), 3 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
