The branch, dharma has been updated
via ca66df56270bde4cd2c96d06c8d3c1ab795552fe (commit)
from 8d95822637aac69fd2fb494298b48bed33292eeb (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ca66df56270bde4cd2c96d06c8d3c1ab795552fe
commit ca66df56270bde4cd2c96d06c8d3c1ab795552fe
Author: spiff <[email protected]>
Date: Tue Feb 1 11:09:32 2011 +0100
[plugin.video.nederland24] updated to version 1.2.2
diff --git a/plugin.video.nederland24/addon.xml
b/plugin.video.nederland24/addon.xml
index bb634a6..7267b7a 100644
--- a/plugin.video.nederland24/addon.xml
+++ b/plugin.video.nederland24/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nederland24"
name="Nederland 24"
- version="1.2.1"
+ version="1.2.2"
provider-name="bosel">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.nederland24/changelog.txt
b/plugin.video.nederland24/changelog.txt
index ef960eb..53ce23d 100644
--- a/plugin.video.nederland24/changelog.txt
+++ b/plugin.video.nederland24/changelog.txt
@@ -1,3 +1,5 @@
+[B]Version 1.2.2[/B]
+-fix double link
[B]Version 1.2.1[/B]
-Branch to Origin
diff --git a/plugin.video.nederland24/default.py
b/plugin.video.nederland24/default.py
index e095d23..509c54b 100644
--- a/plugin.video.nederland24/default.py
+++ b/plugin.video.nederland24/default.py
@@ -59,23 +59,21 @@ def addLink(name,url,iconimage,description,channelId):
retval =
xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=url,listitem=liz)
return retval
-#Start laatste journaal ipad mp4
+#Start laatste journaal ipad mp4, single link
if settings.getSetting( "Laatste Achtuurjournaal" )=='true':
URL='http://nos.nl/'
page=urllib2.urlopen(URL).read()
time=re.findall(r'Achtuurjournaal</strong></a><span>([^*]*?)</span>',page)
- URLlist=re.findall(r'/uitzending/[^a-z]*?-nos-journaal-2000-uur.html',page)
- for URL in URLlist:
- page=urllib2.urlopen(('http://nos.nl')+(URL)).read()
-
video=re.search(r'http://content.nos.nl/content/playlist/uitzending/fragment/(.*?)mp4',page).group()
- time=re.search(r'(NOS Journaal [^*]*?)</title>',page).group(1).strip()
- #title=(video)
- title='Laatste Achtuurjournaal'
- addLink(title,video,os.path.join(IMG_DIR, "laatstejournaal.png"),
time, "29")
+
URLsingle=((re.search(r'/uitzending/[^a-z]*?-nos-journaal-2000-uur.html',page)).group()).strip()
+ page=urllib2.urlopen(('http://nos.nl')+(URLsingle)).read()
+
video=re.search(r'http://content.nos.nl/content/playlist/uitzending/fragment/(.*?)mp4',page).group()
+ time=re.search(r'(NOS Journaal [^*]*?)</title>',page).group(1).strip()
+ title='Laatste Achtuurjournaal'
+ addLink(title,video,os.path.join(IMG_DIR, "laatstejournaal.png"), time,
"29")
else:
print ""
-BASE_URL = 'http://livestreams.omroep.nl'
+BASE_URL = 'http://livestreams.omroep.nl'
if settings.getSetting( "smallband" )=='true':
REZ = 'sb'
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nederland24/addon.xml | 2 +-
plugin.video.nederland24/changelog.txt | 2 ++
plugin.video.nederland24/default.py | 18 ++++++++----------
3 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
