The branch, eden has been updated
via 7703a125c8b48716e5bf03030e134360d0de5fde (commit)
from 7a3685358de7fc896f83e854edb072aac932619e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=7703a125c8b48716e5bf03030e134360d0de5fde
commit 7703a125c8b48716e5bf03030e134360d0de5fde
Author: spiff <[email protected]>
Date: Thu May 10 13:37:48 2012 +0200
[plugin.video.n24_de] updated to version 1.0.6
diff --git a/plugin.video.n24_de/addon.xml b/plugin.video.n24_de/addon.xml
index da69b57..a7298b9 100644
--- a/plugin.video.n24_de/addon.xml
+++ b/plugin.video.n24_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.n24_de" name="N24.de" version="1.0.2"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.n24_de" name="N24.de" version="1.0.6"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
@@ -8,12 +8,12 @@
</extension>
<extension point="xbmc.addon.metadata">
<platform>all</platform>
- <summary lang="de">N24.de</summary>
- <summary lang="en">N24.de</summary>
+ <summary lang="de">N24 Mediathek und Livestream</summary>
+ <summary lang="en">N24 Media Library and Livestream</summary>
+ <language>de</language>
<description lang="de">N24 Mediathek und Livestream</description>
<description lang="en">N24 Media Library and Livestream</description>
<disclaimer lang="en">Some parts of this addon may not be legal in
your country of residence - please check with your local laws before
installing.</disclaimer>
- <broken>Author request: get from XBMCNerds instead</broken>
<platform>all</platform>
</extension>
</addon>
diff --git a/plugin.video.n24_de/changelog.txt
b/plugin.video.n24_de/changelog.txt
index 7ce7ce4..9000e40 100644
--- a/plugin.video.n24_de/changelog.txt
+++ b/plugin.video.n24_de/changelog.txt
@@ -1,3 +1,7 @@
1.0.0 - First Try
1.0.1 - Changed addon.xml
-1.0.2 - Added <disclaimer> Tag to addon.xml
\ No newline at end of file
+1.0.2 - Added <disclaimer> Tag to addon.xml
+1.0.3 - Changed Timeout
+1.0.4 - Fixed Livestream Problem
+1.0.5 - Changed Timeout again
+1.0.6 - Various fixes and optical optimizations
\ No newline at end of file
diff --git a/plugin.video.n24_de/default.py b/plugin.video.n24_de/default.py
index 1d2fa43..330f128 100644
--- a/plugin.video.n24_de/default.py
+++ b/plugin.video.n24_de/default.py
@@ -1,11 +1,13 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-import urllib,urllib2,re,xbmcplugin,xbmcgui,sys
+import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon
pluginhandle = int(sys.argv[1])
+settings = xbmcaddon.Addon(id='plugin.video.n24_de')
+translation = settings.getLocalizedString
def index():
- addDir("Meistgesehen","most_clicked",1,"")
+ addDir(translation(30001),"most_clicked",1,"")
addDir("Dokumentationen","doku",1,"")
addDir("Reportagen","reportage",1,"")
addDir("Magazine","magazin",1,"")
@@ -18,10 +20,9 @@ def index():
addDir("Spezial","spezial",1,"")
addDir("Auto","auto",1,"")
addDir("Talks","talk",1,"")
- addDir("N24 Videosuche","search",8,"")
+ addDir("N24 "+str(translation(30002)),"search",8,"")
addLink("N24 Live Stream","live",9,"")
xbmcplugin.endOfDirectory(pluginhandle)
- if (xbmc.getSkinDir() == "skin.confluence" or xbmc.getSkinDir() ==
"skin.touched"): xbmc.executebuiltin('Container.SetViewMode(50)')
def catToUrl(cat):
listVideos("http://www.n24.de/mediathek/api/box_renderer/GenerateExtendedBox?dataset_name="+cat+"&page=1&limit=40";)
@@ -38,7 +39,6 @@ def listVideos(url1):
urlNew=url1[:url1.find("&page=")]+"&page="+str(currentPage+1)+"&limit=40"
addDir("Next Page",urlNew,7,'')
xbmcplugin.endOfDirectory(pluginhandle)
- if (xbmc.getSkinDir() == "skin.confluence" or xbmc.getSkinDir() ==
"skin.touched"): xbmc.executebuiltin('Container.SetViewMode(500)')
def search():
keyboard = xbmc.Keyboard('', 'Video Suche')
@@ -48,6 +48,18 @@ def search():
listVideos("http://www.n24.de/mediathek/api/box_renderer/GenerateSearchResultsBox?search_string="+search_string+"&page=1&limit=40";)
def liveStream():
+ try:
+ playLiveStream()
+ except:
+ try:
+ playLiveStream()
+ except:
+ try:
+ playLiveStream()
+ except:
+
xbmc.executebuiltin('XBMC.Notification(Info,'+str(translation(30001))+',5000)')
+
+def playLiveStream():
content =
getUrl("http://www.n24.de/mediathek/n24-livestream/stream.html";)
match=re.compile('filename":"(.+?)"',
re.DOTALL).findall(content)
filename=match[0]
@@ -60,11 +72,11 @@ def playVideo(url):
filename=match[0]
listitem =
xbmcgui.ListItem(path="rtmp://pssimn24livefs.fplive.net/pssimn24/"+filename)
return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
-
+
def getUrl(url):
req = urllib2.Request(url)
req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0)
Gecko/20100101 Firefox/11.0')
- response = urllib2.urlopen(req)
+ response = urllib2.urlopen(req,timeout=30)
link=response.read()
response.close()
return link
-----------------------------------------------------------------------
Summary of changes:
plugin.video.n24_de/addon.xml | 8 +++---
plugin.video.n24_de/changelog.txt | 6 ++++-
plugin.video.n24_de/default.py | 26 ++++++++++++++-----
.../resources/language/English/strings.xml | 6 ++++
.../resources/language/German/strings.xml | 6 ++++
5 files changed, 40 insertions(+), 12 deletions(-)
create mode 100644 plugin.video.n24_de/resources/language/English/strings.xml
create mode 100644 plugin.video.n24_de/resources/language/German/strings.xml
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
