The branch, frodo has been updated
via f90d96c6bc2ca089968214762ca850d961475a96 (commit)
from f25141dc9b78f5dede7fbbaec635424756bc54ed (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=f90d96c6bc2ca089968214762ca850d961475a96
commit f90d96c6bc2ca089968214762ca850d961475a96
Author: sphere <[email protected]>
Date: Mon Mar 3 19:36:35 2014 +0100
[plugin.video.mediathek] updated to version 0.6.0
diff --git a/plugin.video.mediathek/addon.xml b/plugin.video.mediathek/addon.xml
index 7d55a18..dd0fe34 100644
--- a/plugin.video.mediathek/addon.xml
+++ b/plugin.video.mediathek/addon.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="plugin.video.mediathek"
- version="0.5.9"
+ version="0.6.0"
name="Mediathek"
- provider-name="Raptor 2101 [[email protected]]">
+ provider-name="Raptor 2101">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
diff --git a/plugin.video.mediathek/changelog.txt
b/plugin.video.mediathek/changelog.txt
index 5c302f7..ce06509 100644
--- a/plugin.video.mediathek/changelog.txt
+++ b/plugin.video.mediathek/changelog.txt
@@ -1,3 +1,4 @@
+0.6.0 - FIX: Regexp for crawling the ARD-Mediathek
0.5.9 - FIX: adopt NDR infrastructure change (by dethfee)
0.5.8 - FIX: adopt NDR link change (by Toerless Eckert)
0.5.7 - CHG: Temporaily disable BR, BR Alpha
diff --git a/plugin.video.mediathek/mediathek/ard.py
b/plugin.video.mediathek/mediathek/ard.py
index fdb835f..d3a52fc 100644
--- a/plugin.video.mediathek/mediathek/ard.py
+++ b/plugin.video.mediathek/mediathek/ard.py
@@ -74,8 +74,9 @@ class ARDMediathek(Mediathek):
TreeNode("2.26","Z",self.rootLink+"/ard/servlet/ajax-cache/3474820/view=list/initial=Z/index.html",True),
)),
)
-
- videoDocument_link_Regex = "/.*?documentId=(\\d*)"
+
#http://www.ardmediathek.de/ard/servlet/scaled/80/78/44/40/8078444-bild-xs16x9"%20alt=""%20/></div><h3%20class="mt-title"><a%20href="/das-erste/lindenstrasse-vorschau-zum-mitnehmen?documentId=18548684
+
+ videoDocument_link_Regex = "/[^\"]*?documentId=(\\d*)"
metaInfo_link_Regex =
"/ard/servlet/ajax-cache/\\d*/view=ajax(/clipFilter=fernsehen){0,1}(/isFromList=true){0,1}/index.html"
ajaxDocumentLink =
"/ard/servlet/ajax-cache/(\\d*)/view=(switch|ajax|list)(/clipFilter=fernsehen){0,1}(/content=fernsehen){0,1}(/documentId=\\d*){0,1}/index.html"
self.findImage_regex = "<img.*?src=\".*?\".*?/>";
@@ -141,6 +142,8 @@ class ARDMediathek(Mediathek):
if(isPlayable):
displayObject.link = self.getVideoLink(self.rootLink+videoDocumentLink);
+ if(len(displayObject.link) == 0):
+ return;
else:
displayObject.link = self.rootLink+videoDocumentLink;
displayObject.isPlayable = False;
diff --git a/plugin.video.mediathek/mediathek/zdf.py
b/plugin.video.mediathek/mediathek/zdf.py
index 501ccd8..801bade 100644
--- a/plugin.video.mediathek/mediathek/zdf.py
+++ b/plugin.video.mediathek/mediathek/zdf.py
@@ -44,23 +44,23 @@ class ZDFMediathek(Mediathek):
TreeNode("2","Sendung
verpasst?","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst?flash=off",False,(
TreeNode("2.0","Heute","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day0?flash=off",True),
TreeNode("2.1","Gestern","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day1?flash=off",True),
- TreeNode("2.2","vor 2
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day2?flash=off",True),
- TreeNode("2.3","vor 3
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day3?flash=off",True),
- TreeNode("2.4","vor 4
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day4?flash=off",True),
- TreeNode("2.5","vor 5
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day5?flash=off",True),
- TreeNode("2.6","vor 6
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day6?flash=off",True),
- TreeNode("2.7","vor 7
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day7?flash=off",True),
+ TreeNode("2.2","vor 2
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day2?flash=off",True),
+ TreeNode("2.3","vor 3
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day3?flash=off",True),
+ TreeNode("2.4","vor 4
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day4?flash=off",True),
+ TreeNode("2.5","vor 5
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day5?flash=off",True),
+ TreeNode("2.6","vor 6
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day6?flash=off",True),
+ TreeNode("2.7","vor 7
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-verpasst/day7?flash=off",True),
)
),
TreeNode("3","LIVE","http://www.zdf.de/ZDFmediathek/hauptnavigation/live?flash=off",False,(
TreeNode("3.0","Heute","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day0?flash=off",True),
TreeNode("3.1","Gestern","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day1?flash=off",True),
- TreeNode("3.2","vor 2
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day2?flash=off",True),
- TreeNode("3.3","vor 3
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day3?flash=off",True),
- TreeNode("3.4","vor 4
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day4?flash=off",True),
- TreeNode("3.5","vor 5
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day5?flash=off",True),
- TreeNode("3.6","vor 6
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day6?flash=off",True),
- TreeNode("3.7","vor 7
Tage","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day7?flash=off",True),
+ TreeNode("3.2","vor 2
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day2?flash=off",True),
+ TreeNode("3.3","vor 3
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day3?flash=off",True),
+ TreeNode("3.4","vor 4
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day4?flash=off",True),
+ TreeNode("3.5","vor 5
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day5?flash=off",True),
+ TreeNode("3.6","vor 6
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day6?flash=off",True),
+ TreeNode("3.7","vor 7
Tagen","http://www.zdf.de/ZDFmediathek/hauptnavigation/live/day7?flash=off",True),
)
),
TreeNode("4","Sendungen
A-Z","http://www.zdf.de/ZDFmediathek/hauptnavigation/sendung-a-bis-z?flash=off",False,
@@ -323,4 +323,4 @@ class ZDFMediathek(Mediathek):
if node.nodeType == Node.TEXT_NODE:
node.data = node.data.strip()
else:
- self.cleanupNodes(node);
\ No newline at end of file
+ self.cleanupNodes(node);
diff --git a/plugin.video.mediathek/simplexbmc.py
b/plugin.video.mediathek/simplexbmc.py
index 65e0a87..17c2703 100644
--- a/plugin.video.mediathek/simplexbmc.py
+++ b/plugin.video.mediathek/simplexbmc.py
@@ -165,7 +165,7 @@ class SimpleXbmcGui(object):
listItem.setProperty("PlayPath", link);
playlist.add(url=link, listitem=listItem);
- player.play(playlist, playerItem);
+ player.play(playlist, playerItem, false);
def errorOK(self,title="", msg=""):
e = str( sys.exc_info()[ 1 ] )
-----------------------------------------------------------------------
Summary of changes:
plugin.video.mediathek/addon.xml | 4 ++--
plugin.video.mediathek/changelog.txt | 1 +
plugin.video.mediathek/mediathek/ard.py | 7 +++++--
plugin.video.mediathek/mediathek/zdf.py | 26 +++++++++++++-------------
plugin.video.mediathek/simplexbmc.py | 2 +-
5 files changed, 22 insertions(+), 18 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
