The branch, eden has been updated
via 6e4fcd0f7d60c6634bc85786edf1b8806d73cb60 (commit)
from b8048b22c41a0c42fc3aab711523db6321fec069 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6e4fcd0f7d60c6634bc85786edf1b8806d73cb60
commit 6e4fcd0f7d60c6634bc85786edf1b8806d73cb60
Author: beenje <bee...@xbmc.org>
Date: Sun Jan 13 18:16:59 2013 +0100
[plugin.video.nederland24] updated to version 2.2.0
diff --git a/plugin.video.nederland24/addon.xml
b/plugin.video.nederland24/addon.xml
index 0f7481e..b6636b2 100644
--- a/plugin.video.nederland24/addon.xml
+++ b/plugin.video.nederland24/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.nederland24" name="Nederland 24" version="2.1.5"
provider-name="bosel">
+<addon id="plugin.video.nederland24" name="Nederland 24" version="2.2.0"
provider-name="bosel">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/plugin.video.nederland24/changelog.txt
b/plugin.video.nederland24/changelog.txt
index ea12900..2a57a62 100644
--- a/plugin.video.nederland24/changelog.txt
+++ b/plugin.video.nederland24/changelog.txt
@@ -1,20 +1,27 @@
-<b>2.1.5</b>
+[B]2.2.0 EDEN[/B]
+-create Eden branch
+-Changelog format
+-Additional channel package - laatste journaal, laatste achtuurjournaal,
jeugdjournaal
+-Fanart added
+-Cleanup
+
+[B]2.1.5[/B]
Eden
-Required changes due to cancelled channels
-Required fixes due to altered website
-<b>2.1.4</b>
+[B]2.1.4[/B]
Eden
-Channels - Disable Laatste Achtuurjournaal
-Set language
-Cleanup
-<b>2.1.3</b>
+[B]2.1.3[/B]
Eden
-Settings - Default Settings
-Cleanup
-<b>2.1.2</b>
+[B]2.1.2[/B]
Eden
-Channels - Cancelled channels removed
-Channels - Sources for j24/p24 updated to improve stability
diff --git a/plugin.video.nederland24/nederland24.py
b/plugin.video.nederland24/nederland24.py
index 20116b2..5b7dc79 100644
--- a/plugin.video.nederland24/nederland24.py
+++ b/plugin.video.nederland24/nederland24.py
@@ -18,6 +18,9 @@ IMG_DIR =
os.path.join(settings.getAddonInfo("path"),"resources", "media")
def addLink(name,url,iconimage,description,channelId):
retval=True
+
+
+#curl http://nos.nl/nieuws/live/politiek24/#tab-programma
#if channelId!="0" and channelId!="29":
#HTML=urllib2.urlopen("http://player.omroep.nl/?zenid="; +
channelId).read()
@@ -39,6 +42,7 @@ def addLink(name,url,iconimage,description,channelId):
#print ""
liz = xbmcgui.ListItem(name, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
+ liz.setProperty("IsPlayable","true")
liz.setInfo( type="Video", infoLabels={ "Title": name,
#"Season":1,
#"Episode":1,,
@@ -48,6 +52,27 @@ def addLink(name,url,iconimage,description,channelId):
})
retval = xbmcplugin.addDirectoryItem(handle,url=url,listitem=liz)
return retval
+
+#Journaal Additional Channels (lifted from nos addon, with thanks)
+if settings.getSetting( "Journaal Additional Channels" )=='true':
+ link_re = re.compile(r'<a.*?</a>', re.S)
+ video_re = re.compile(r'http://.*\.mp4')
+ title_re = re.compile(r'<h3>(.*?)</h3>')
+ meta_re = re.compile(r'<p class="video-meta">(.*?)</p>')
+ img_re = re.compile(r'<img src="(.*?)"')
+
+ URL='http://tv.nos.nl'
+ html=urllib2.urlopen(URL).read()
+ for (a, video_url) in zip(link_re.findall(html), video_re.findall(html)):
+ a = a.replace('\n', '')
+ title = title_re.search(a).group(1).strip()
+ meta = ', '.join([meta_part.strip() for meta_part in re.sub(r'\s+', ' ',
meta_re.search(a).group(1)).split('<br />')])
+ #img = URL + '/browser/' + img_re.search(a).group(1).strip()
+ img = os.path.join(IMG_DIR, "placeholder24.png")
+ #title = title + ' - ' + meta
+ addLink(title, video_url, img, meta, 116)
+
+
####Disabled website has changed
# ## Laatste achtuurjournaal ipad mp4, single link
diff --git a/plugin.video.nederland24/resources/language/Dutch/strings.xml
b/plugin.video.nederland24/resources/language/Dutch/strings.xml
index 0acf99e..d275d53 100644
--- a/plugin.video.nederland24/resources/language/Dutch/strings.xml
+++ b/plugin.video.nederland24/resources/language/Dutch/strings.xml
@@ -14,6 +14,7 @@
<string id="30113">Laatste Achtuurjournaal</string>
<string id="30114">Journaal 24 Alternatief</string>
<string id="30115">Politiek 24 Alternatief</string>
+ <string id="30116">Aanvullende Kanalen Journaal</string>
<!--Bandwidth-->
<string id="30201">Langzame internetverbinding (smalband)</string>
<string id="30202">Door GEOIP tot Nederland beperkte kanalen
uitschakelen</string>
diff --git a/plugin.video.nederland24/resources/language/English/strings.xml
b/plugin.video.nederland24/resources/language/English/strings.xml
index 1feb112..eb72868 100644
--- a/plugin.video.nederland24/resources/language/English/strings.xml
+++ b/plugin.video.nederland24/resources/language/English/strings.xml
@@ -14,6 +14,7 @@
<string id="30113">Laatste Achtuurjournaal</string>
<string id="30114">Journaal 24 Alternative</string>
<string id="30115">Politiek 24 Alternative</string>
+ <string id="30116">Journaal Additional Channels</string>
<!--Bandwidth-->
<string id="30201">Low Bandwidth</string>
<string id="30202">Disable GEOIP restricted channels (for usage outside
of the Netherlands)</string>
diff --git a/plugin.video.nederland24/resources/settings.xml
b/plugin.video.nederland24/resources/settings.xml
index 387bbd4..c82ae36 100644
--- a/plugin.video.nederland24/resources/settings.xml
+++ b/plugin.video.nederland24/resources/settings.xml
@@ -13,6 +13,7 @@
<!-- <setting id="Laatste Achtuurjournaal" label="30113" type="bool"
default="true" />-->
<!-- <setting id="Journaal 24 alternative" label="30114" type="bool"
default="false" />-->
<!-- <setting id="Politiek 24 alternative" label="30115" type="bool"
default="false" />-->
+ <setting id="Journaal Additional Channels" label="30116" type="bool"
default="true" />
</category>
<!--Bandwith-->
<category label="30200">
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nederland24/addon.xml | 2 +-
plugin.video.nederland24/changelog.txt | 15 ++++++++---
plugin.video.nederland24/fanart.jpg | Bin 0 -> 92491 bytes
plugin.video.nederland24/nederland24.py | 25 ++++++++++++++++++++
.../resources/language/Dutch/strings.xml | 1 +
.../resources/language/English/strings.xml | 1 +
.../resources/media/consumenten24.png | Bin 34748 -> 0 bytes
.../resources/media/placeholder24.png | Bin 0 -> 19874 bytes
.../resources/media/spirit24.png | Bin 25909 -> 0 bytes
plugin.video.nederland24/resources/settings.xml | 1 +
10 files changed, 40 insertions(+), 5 deletions(-)
create mode 100644 plugin.video.nederland24/fanart.jpg
delete mode 100644 plugin.video.nederland24/resources/media/consumenten24.png
create mode 100644 plugin.video.nederland24/resources/media/placeholder24.png
delete mode 100644 plugin.video.nederland24/resources/media/spirit24.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_123012
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
