The branch, frodo has been updated
via 9bf9e67e4369e3c684503aad1e2a3f2dc38754c4 (commit)
via b7c944c6cce70af38f0e328ebda4ef32d12aece6 (commit)
via 5f43b021543b63566f7d9def7c7fa8a3bdf5739c (commit)
via df4ec65a32d998426f651ecbe00b4d07e802cd91 (commit)
from 7265822e1dd83c2dab648672373e8d5cc6fd030a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=9bf9e67e4369e3c684503aad1e2a3f2dc38754c4
commit 9bf9e67e4369e3c684503aad1e2a3f2dc38754c4
Author: beenje <[email protected]>
Date: Sat Jan 12 22:58:52 2013 +0100
[plugin.video.manoto] updated to version 1.0.7
diff --git a/plugin.video.manoto/addon.xml b/plugin.video.manoto/addon.xml
index 30b7482..9e1e4a3 100755
--- a/plugin.video.manoto/addon.xml
+++ b/plugin.video.manoto/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.manoto"
name="Manoto TV"
- version="1.0.6"
+ version="1.0.7"
provider-name="babak">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.manoto/default.py b/plugin.video.manoto/default.py
index 6bd2037..6c04a20 100644
--- a/plugin.video.manoto/default.py
+++ b/plugin.video.manoto/default.py
@@ -79,20 +79,9 @@ def loginAndParse():
ck = cookielib.Cookie(version=0, name=parsedJS[0][0],
value=parsedJS[0][1], port=None, port_specified=False, domain=domain,
domain_specified=False, domain_initial_dot=False, path='/',
path_specified=True, secure=False, expires=None, discard=True, comment=None,
comment_url=None, rest={'HttpOnly': None}, rfc2109=False)
cj.set_cookie(ck)
- resp = opener.open(url)
- html_data = resp.read()
-
- soup = BeautifulSoup(html_data)
- eventVal = soup.find('input',id='__EVENTVALIDATION',type='hidden')
- viewState = soup.find('input',id='__VIEWSTATE',type='hidden')
+ params = 'UserName=%s&Password=%s&btnLogin=ture&bRememberMe=false' %
(urllib.quote(__settings__.getSetting('username')),
urllib.quote(__settings__.getSetting('password')))
- if eventVal is None or viewState is None:
- xbmcplugin.endOfDirectory(handle=int(sys.argv[1]))
- return False
-
- params =
'__EVENTARGUMENT=&__EVENTTARGET=ctl00%%24ContentPlaceHolderMainContent%%24lbtnEnter&__EVENTVALIDATION=%s&__VIEWSTATE=%s&ctl00%%24ContentPlaceHolderMainContent%%24txtUsername=%s&ctl00%%24ContentPlaceHolderMainContent%%24txtPassword=%s'
% (urllib.quote(eventVal['value']), urllib.quote(viewState['value']),
urllib.quote(__settings__.getSetting('username')),
urllib.quote(__settings__.getSetting('password')))
-
- resp = opener.open('https://www.manoto1.com/LiveStream.aspx', params)
+ resp = opener.open('https://www.manoto1.com/User/Home/Login', params)
resp = opener.open(url)
html_data = resp.read()
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=b7c944c6cce70af38f0e328ebda4ef32d12aece6
commit b7c944c6cce70af38f0e328ebda4ef32d12aece6
Author: beenje <[email protected]>
Date: Sat Jan 12 22:43:25 2013 +0100
[plugin.video.filmon] updated to version 4.2.6
diff --git a/plugin.video.filmon/addon.xml b/plugin.video.filmon/addon.xml
index 3e36424..5d27554 100644
--- a/plugin.video.filmon/addon.xml
+++ b/plugin.video.filmon/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.filmon" name="FilmOn" version="4.2.5"
provider-name="FilmOn.TV Networks Inc">
+<addon id="plugin.video.filmon" name="FilmOn" version="4.2.6"
provider-name="FilmOn.TV Networks Inc">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.t0mm0.common" version="1.1.0"/>
diff --git a/plugin.video.filmon/changelog.txt
b/plugin.video.filmon/changelog.txt
index 9cb0bf1..4e47897 100644
--- a/plugin.video.filmon/changelog.txt
+++ b/plugin.video.filmon/changelog.txt
@@ -1,3 +1,6 @@
+v4.2.6
+Fixed News Channels
+
v4.2.5
Fixed Local Channels
Frodo Compatible
diff --git a/plugin.video.filmon/default.py b/plugin.video.filmon/default.py
index 8bbe251..ee64335 100644
--- a/plugin.video.filmon/default.py
+++ b/plugin.video.filmon/default.py
@@ -235,30 +235,35 @@ def GET_STREAMS(url):
foregex= stream['url']+'<'
playpath=stream['name']
name=stream['quality']
- try:
- regex = re.compile('rtmp://(.+?)/(.+?)/<')
- match = regex.search(foregex)
- app = '%s/' %(match.group(2))
+ if re.search('m4v',playpath,re.IGNORECASE):
+ app = 'vod'
url= stream['url']+playpath
swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
- except:
- pass
- try:
- regex =
re.compile('rtmp://(.+?)/(.+?)/(.+?)id=([a-f0-9]*?)<')
- match = regex.search(foregex)
- app = '%s/%sid=%s' %(match.group(2),
match.group(3),match.group(4))
- url= stream['url']
- swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
- except:
- pass
- try:
- regex = re.compile('rtmp://(.+?)/(.+?)id=(.+?)"')
- match1 = regex.search(foregex)
- app = '%sid=%s' %(match1.group(2), match1.group(3))
- url= stream['url']+playpath
-
swfUrl='http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf?v=28'
- except:
- pass
+ else:
+ try:
+ regex = re.compile('rtmp://(.+?)/(.+?)/<')
+ match = regex.search(foregex)
+ app = '%s/' %(match.group(2))
+ url= stream['url']+playpath
+ swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
+ except:
+ pass
+ try:
+ regex =
re.compile('rtmp://(.+?)/(.+?)/(.+?)id=(.+?)<')
+ match = regex.search(foregex)
+ app = '%s/%sid=%s' %(match.group(2),
match.group(3),match.group(4))
+ url= stream['url']
+ swfUrl=
'http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf'
+ except:
+ pass
+ try:
+ regex = re.compile('rtmp://(.+?)/(.+?)id=(.+?)<')
+ match1 = regex.search(foregex)
+ app = '%sid=%s' %(match1.group(2), match1.group(3))
+ url= stream['url']+playpath
+
swfUrl='http://www.filmon.com/tv/modules/FilmOnTV/files/flashapp/filmon/FilmonPlayer.swf?v=28'
+ except:
+ pass
tcUrl=stream['url']
pageUrl = 'http://www.filmon.com/'
url= str(url)+' playpath='+str(playpath)+' app='+str(app)+'
swfUrl='+str(swfUrl)+' tcUrl='+str(tcUrl)+' pageurl='+str(pageUrl)
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=5f43b021543b63566f7d9def7c7fa8a3bdf5739c
commit 5f43b021543b63566f7d9def7c7fa8a3bdf5739c
Author: beenje <[email protected]>
Date: Sat Jan 12 22:42:46 2013 +0100
[plugin.video.vgtv] updated to version 2.0.4
diff --git a/plugin.video.vgtv/addon.py b/plugin.video.vgtv/addon.py
index 9278502..96bd108 100644
--- a/plugin.video.vgtv/addon.py
+++ b/plugin.video.vgtv/addon.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright 2012 Espen Hovlandsdal
+# Copyright 2012-2013 Espen Hovlandsdal
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/plugin.video.vgtv/addon.xml b/plugin.video.vgtv/addon.xml
index 77637ba..c4bfeac 100644
--- a/plugin.video.vgtv/addon.xml
+++ b/plugin.video.vgtv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.vgtv" name="VGTV" version="1.0.2" provider-name="Espen
Hovlandsdal">
+<addon id="plugin.video.vgtv" name="VGTV" version="2.0.4" provider-name="Espen
Hovlandsdal">
<requires>
- <import addon="xbmc.python" version="2.0"/>
+ <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.xbmcswift2" version="1.1.1"/>
<import addon="script.module.simplejson" version="2.0.10"/>
</requires>
diff --git a/plugin.video.vgtv/changelog.txt b/plugin.video.vgtv/changelog.txt
index fe99d88..b1927a0 100644
--- a/plugin.video.vgtv/changelog.txt
+++ b/plugin.video.vgtv/changelog.txt
@@ -1,3 +1,9 @@
+[B]2.0.4[/B]
+- Changed versioning scheme to differentiate frodo from eden branch
+
+[B]1.0.3[/B]
+- Fixed a crash when a video does not have a mp4 or m3u8 entry in the feed
+
[B]1.0.2[/B]
- Updated xbmc.python version and language tag for plugin
diff --git a/plugin.video.vgtv/resources/lib/api.py
b/plugin.video.vgtv/resources/lib/api.py
index 1c64264..943d42f 100644
--- a/plugin.video.vgtv/resources/lib/api.py
+++ b/plugin.video.vgtv/resources/lib/api.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright 2012 Espen Hovlandsdal
+# Copyright 2012-2013 Espen Hovlandsdal
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -150,6 +150,9 @@ class VgtvApi():
if ('mp4' not in video['formats']['http'] and
'm3u8' in video['formats']['http']):
format = 'm3u8'
+ elif ('mp4' not in video['formats']['http'] and
+ 'flv' in video['formats']['http']):
+ format = 'flv'
else:
# Reverse order for stuff we have to resolve
# Had some trouble getting mp4 stream to work
diff --git a/plugin.video.vgtv/resources/lib/utils.py
b/plugin.video.vgtv/resources/lib/utils.py
index 2876c1d..bd4ee7d 100644
--- a/plugin.video.vgtv/resources/lib/utils.py
+++ b/plugin.video.vgtv/resources/lib/utils.py
@@ -1,19 +1,23 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+# Copyright 2012-2013 Espen Hovlandsdal
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+# This module contains utility functions used throughout the VGTV plugin
+
import re
import htmlentitydefs
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=df4ec65a32d998426f651ecbe00b4d07e802cd91
commit df4ec65a32d998426f651ecbe00b4d07e802cd91
Author: beenje <[email protected]>
Date: Sat Jan 12 22:42:40 2013 +0100
[plugin.video.nederland24] updated to version 3.0.0
diff --git a/plugin.video.nederland24/addon.xml
b/plugin.video.nederland24/addon.xml
index 798d789..15abf31 100644
--- a/plugin.video.nederland24/addon.xml
+++ b/plugin.video.nederland24/addon.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.nederland24" name="Nederland 24" version="2.1.4"
provider-name="bosel">
+<addon id="plugin.video.nederland24" name="Nederland 24" version="3.0.0"
provider-name="bosel">
<requires>
- <import addon="xbmc.python" version="2.0"/>
+ <import addon="xbmc.python" version="2.1.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="nederland24.py">
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
- <summary lang="en">Nederland 24</summary>
- <summary lang="nl">Nederland 24</summary>
+ <summary lang="en">Dutch Public Broadcasting - Digital Channels and News
Broadcasts</summary>
+ <summary lang="nl">Digitale kanalen en Journaaluitzendingen van de
Publieke Omroep</summary>
<description lang="en">Dutch public broadcasting offers a number of
digital theme channels available on Nederland 24. These specialized public
broadcasting channels supply specific target audiences with thematic
programming 24 hours a day. These channels provide more in-depth, broader and
supplementary content that cannot be found on the three regular public
channels. Dutch viewers decide for themselves on Nederland 24.</description>
<description lang="nl">De publieke omroep biedt het Nederlandse publiek
een aantal digitale themakanalen gebundeld in Nederland 24. Door middel van
gespecialiseerde kanalen kan de publieke omroep specifieke doelgroepen 24 uur
per dag van een thematische programmering voorzien. Het aanbod op deze kanalen
vormt een verdieping, verbreding, aanvulling en/of versterking van reguliere
uitzendingen en speelt in op het veranderende mediagedrag van het publiek. Het
Nederlandse publiek kiest zelf wat het kijkt op Nederland 24.</description>
<platform>all</platform>
diff --git a/plugin.video.nederland24/changelog.txt
b/plugin.video.nederland24/changelog.txt
index 8a24228..630b0ab 100644
--- a/plugin.video.nederland24/changelog.txt
+++ b/plugin.video.nederland24/changelog.txt
@@ -1,16 +1,24 @@
-<b>2.1.4</b>
-Eden
+[B]3.0.0 - Frodo[/B]
+-Frodo compatible
+-Changelog format
+-Additional channel package - laatste journaal, laatste achtuurjournaal,
jeugdjournaal
+-Fanart added
+-Cleanup
+
+[B]2.1.5[/B]
+-Required changes due to cancelled channels
+-Required fixes due to altered website
+
+[B]2.1.4[/B]
-Channels - Disable Laatste Achtuurjournaal
-Set language
-Cleanup
-<b>2.1.3</b>
-Eden
+[B]2.1.3[/B]
-Settings - Default Settings
-Cleanup
-<b>2.1.2</b>
-Eden
+[B]2.1.2 - Eden[/B]
-Channels - Cancelled channels removed
-Channels - Sources for j24/p24 updated to improve stability
-Settings - Disable GEOIP restricted channels
diff --git a/plugin.video.nederland24/nederland24.py
b/plugin.video.nederland24/nederland24.py
index 12570ad..5b7dc79 100644
--- a/plugin.video.nederland24/nederland24.py
+++ b/plugin.video.nederland24/nederland24.py
@@ -6,7 +6,7 @@ import urllib2
import re
xbmc.log("plugin.video.nederland24:: Starting Addon")
-
+
# plugin handle
handle = int(sys.argv[1])
@@ -17,37 +17,62 @@ IMG_DIR =
os.path.join(settings.getAddonInfo("path"),"resources", "media")
def addLink(name,url,iconimage,description,channelId):
- retval=True
-
- if channelId!="0" and channelId!="29":
- HTML=urllib2.urlopen("http://player.omroep.nl/?zenid="; +
channelId).read()
- nowTitle=((re.search(r'<span
id="nowTitle">([^*]*?)</span>',HTML)).group(1)).strip()
- nowPlot=(re.search(r'<p
id="nowText">([^*]*?)</p>',HTML)).group(1).strip()
- #nowTime=(re.search(r'<p
id="nowTime">([^*]*?)</p>',HTML)).group(1).strip()
- nextTitle=((re.search(r'<span
id="nextTitle">([^*]*?)</span>',HTML)).group(1)).strip()
- nextPlot=(re.search(r'<p
id="nextText">([^*]*?)</p>',HTML)).group(1).strip()
- nextTime=(re.search(r'<p
id="nextTime">Aanvang:([^*]*?)</p>',HTML)).group(1).strip()
- #channelEPG = "Nu: %s\n%s\n\nStraks: %s\n%s\n%s" % (nowTitle,
nowPlot, nextTime, nextTitle, nextPlot)
- channelEPG = "%s\n%s\n\n%s - %s\n%s" % (nowTitle, nowPlot,
nextTime, nextTitle, nextPlot)
-
- elif channelId!="0":
- channelEPG = time
- nowTitle = time
- nowPlot = time
- else:
- print ""
-
-
- liz = xbmcgui.ListItem(channelEPG, iconImage="DefaultVideo.png",
thumbnailImage=iconimage)
- liz.setInfo( type="Video", infoLabels={ "Title": name,
+ 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()
+ #xbmc.log(HTML)
+ #nowTitle=((re.search(r'<span
id="nowTitle">([^*]*?)</span>',HTML)).group(1)).strip()
+ #nowPlot=(re.search(r'<p
id="nowText">([^*]*?)</p>',HTML)).group(1).strip()
+ ##nowTime=(re.search(r'<p
id="nowTime">([^*]*?)</p>',HTML)).group(1).strip()
+ #nextTitle=((re.search(r'<span
id="nextTitle">([^*]*?)</span>',HTML)).group(1)).strip()
+ #nextPlot=(re.search(r'<p
id="nextText">([^*]*?)</p>',HTML)).group(1).strip()
+ #nextTime=(re.search(r'<p
id="nextTime">Aanvang:([^*]*?)</p>',HTML)).group(1).strip()
+ ##channelEPG = "Nu: %s\n%s\n\nStraks: %s\n%s\n%s" % (nowTitle,
nowPlot, nextTime, nextTitle, nextPlot)
+ #channelEPG = "%s\n%s\n\n%s - %s\n%s" % (nowTitle, nowPlot, nextTime,
nextTitle, nextPlot)
+
+ #elif channelId!="0":
+ #channelEPG = time
+ #nowTitle = time
+ #nowPlot = time
+ #else:
+ #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,,
#"premiered":channelTime,
- "Plot":channelEPG,
- "TVShowTitle":nowTitle
+ "Plot":description,
+ "TVShowTitle":name
})
- retval = xbmcplugin.addDirectoryItem(handle,url=url,listitem=liz)
- return retval
+ 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
@@ -64,72 +89,68 @@ def addLink(name,url,iconimage,description,channelId):
# title='Laatste Achtuurjournaal'
# addLink(title,video,os.path.join(IMG_DIR, "laatstejournaal.png"), time,
"29")
# #<a href="/uitzendingen/[^a-z]*?" title="Laatste Achtuurjournaal">
-
-## Journaal 24 ipad mp4, stream
-if settings.getSetting ( "Journaal 24" )=='true':
- URL='http://player.omroep.nl/?zenid=230'
- HTML=urllib2.urlopen(URL).read()
- nowTitle=((re.search(r'<span
id="nowTitle">([^*]*?)</span>',HTML)).group(1)).strip()
- nowPlot=(re.search(r'<p id="nowText">([^*]*?)</p>',HTML)).group(1).strip()
- #nowTime=(re.search(r'<p
id="nowTime">([^*]*?)</p>',HTML)).group(1).strip()
- nextTitle=((re.search(r'<span
id="nextTitle">([^*]*?)</span>',HTML)).group(1)).strip()
- nextPlot=(re.search(r'<p
id="nextText">([^*]*?)</p>',HTML)).group(1).strip()
- nextTime=(re.search(r'<p
id="nextTime">Aanvang:([^*]*?)</p>',HTML)).group(1).strip()
- time= "%s\n%s\n\n%s - %s\n%s" % (nowTitle, nowPlot, nextTime, nextTitle,
nextPlot)
-
video='http://download.omroep.nl/nos/iphone-live-streaming/j24/j24_ipad.m3u8'
- title='Journaal 24'
- addLink(title,video,os.path.join(IMG_DIR, "journaal24.png"), time, "29")
-
-
-## Politiek ipad mp4, stream
-if settings.getSetting ( "Politiek 24" )=='true':
- URL='http://nos.nl/nieuws/live/politiek24/'
- page=urllib2.urlopen(URL).read()
-
video='http://download.omroep.nl/nos/iphone-live-streaming/p24/p24_ipad.m3u8'
- ##check for current debate seems to work, there must be a better way to do
this however.
- tmpitem=re.search(r'(Politiek 24</a>(.+?)</li> </ul>)',page)
- if tmpitem:
- time=re.search(r'(Politiek 24</a>(.+?)</li>
</ul>)',page).group(2).strip()
- else:
- time='Politiek 24'
- title='Politiek 24'
- addLink(title,video,os.path.join(IMG_DIR, "politiek24.png"), time, "29")
-
-else:
- print ""
+
+####Disabled link no longer available
+### Journaal 24 ipad mp4, stream
+#if settings.getSetting ( "Journaal 24 alternative" )=='true':
+# URL='http://player.omroep.nl/?zenid=230'
+# HTML=urllib2.urlopen(URL).read()
+# if re.match(r'<span id="nowTitle">([^*]*?)</span>',HTML):
+# nowTitle=((re.search(r'<span
id="nowTitle">([^*]*?)</span>',HTML)).group(1)).strip()
+# nowPlot=(re.search(r'<p
id="nowText">([^*]*?)</p>',HTML)).group(1).strip()
+# nowTime=(re.search(r'<p
id="nowTime">([^*]*?)</p>',HTML)).group(1).strip()
+# nextTitle=((re.search(r'<span
id="nextTitle">([^*]*?)</span>',HTML)).group(1)).strip()
+# nextPlot=(re.search(r'<p
id="nextText">([^*]*?)</p>',HTML)).group(1).strip()
+# nextTime=(re.search(r'<p
id="nextTime">Aanvang:([^*]*?)</p>',HTML)).group(1).strip()
+# time= "%s\n%s\n\n%s - %s\n%s" % (nowTitle, nowPlot, nextTime,
nextTitle, nextPlot)
+#
video='http://download.omroep.nl/nos/iphone-live-streaming/j24/j24_ipad.m3u8'
+# title='Journaal 24 alternative'
+# addLink(title,video,os.path.join(IMG_DIR, "journaal24.png"), time,
"29")
+
+####Disabled link no longer available
+## Politiek ipad mp4, stream
+#if settings.getSetting ( "Politiek 24 alternative" )=='true':
+# URL='http://nos.nl/nieuws/live/politiek24/'
+# page=urllib2.urlopen(URL).read()
+#
video='http://download.omroep.nl/nos/iphone-live-streaming/p24/p24_ipad.m3u8'
+# ##check for current debate seems to work, there must be a better way to
do this however.
+# tmpitem=re.search(r'(Politiek 24</a>(.+?)</li> </ul>)',page)
+# if tmpitem:
+# time=re.search(r'(Politiek 24</a>(.+?)</li>
</ul>)',page).group(2).strip()
+# else:
+# time='Politiek 24 alternative'
+# title='Politiek 24 alternative'
+# addLink(title,video,os.path.join(IMG_DIR, "politiek24.png"), time, "29")
+#
+#else:
+# print ""
BASE_URL = 'http://livestreams.omroep.nl'
-
+
if settings.getSetting( "smallband" )=='true':
REZ = 'sb'
else:
REZ = 'bb'
-
+
CHANNELS = [
+ ["Journaal 24", "journaal24.png", "/nos/journaal24-", "Via het themakanaal
'Journaal 24' kunnen de live televisieuitzendingen van het NOS Journaal worden
gevolgd. De laatste Journaaluitzending wordt herhaald tot de volgende
uitzending van het NOS Journaal.", "230"],
+ ["Politiek 24", "politiek24.png", "/nos/politiek24-", "Politiek 24 is het
digitale kanaal over de Nederlandse politiek in de breedste zin van het
woord.", "247"],
["101 TV", "101tv.png", "/npo/101tv-", "Weg met suffe en saaie tv! Het is
tijd voor 101 TV, het 24-uurs jongerenkanaal van BNN en de Publieke Omroep. Met
rauwe en brutale programma's, van en voor jongeren. Boordevol hilarische
fragmenten, spannende livegames, bizarre experimenten en nieuws over festivals
en gratis concertkaartjes. Kijken dus!", "246"],
["Best 24", "best24.png", "/npo/best24-", "Best 24 brengt hoogtepunten uit
zestig jaar televisiehistorie. Het is een feelgoodkanaal met 24 uur per dag de
leukste, grappigste en meest spraakmakende programma's uit de Hilversumse
schatkamer. Best 24: de schatkamer van de publieke omroep.", "252"],
- ["News Ticker", "consumenten24.png", "/npo/consumenten24-", "Op Consumenten
24 ziet u dagelijks het laatste consumentennieuws en kunt u de hele week kijken
naar herhalingen van Radar, Kassa, en vele andere consumentenprogramma's. In
Vraag en Beantwoord kunt u live uw vraag stellen per telefoon en webcam.",
"238"],
["Cultura 24", "cultura24.png", "/npo/cultura24-", "Dit is het
'cultuurkanaal van de Publieke Omroep' met de beste recente en oudere 'kunst en
expressie' over verschillende onderwerpen. Klassieke muziek, dans, literatuur,
theater, beeldende kunst, film 'Waar cultuur is, is Cultura 24'.", "239"],
["Familie 24 / Z@ppelin", "familie24.png", "/npo/familie24-", "Z@ppelin24
zendt dagelijks uit van half drie 's nachts tot half negen 's avonds. Familie24
is er op de tussenliggende tijd. Z@ppelin 24 biedt ruimte aan (oude) bekende
peuterprogramma's en je kunt er kijken naar nieuwe kleuterseries. Op Familie24
zijn bekende programma's te zien en nieuwe programma's en documentaires die
speciaal voor Familie24 zijn gemaakt of aangekocht.", "261"],
["Holland Doc 24", "hollanddoc24.png", "/npo/hollanddoc24-", "Holland Doc 24
brengt op verschillende manieren en niveaus documentaires en reportages onder
de aandacht. De programmering op Holland Doc 24 is gecentreerd rond wekelijkse
thema's, die gerelateerd zijn aan de actualiteit, de programmering van
documentairerubrieken, van culturele instellingen en festivals.", "227"],
- ["Humor TV 24", "humortv24.png", "/npo/humortv24-", "Humor TV 24 is een
uitgesproken comedykanaal: een frisse, Nederlandse humorzender met
hoogwaardige, grappige, scherpe, jonge, nieuwe, satirische, humoristische
programma's.", "241"],
- ["Journaal 24 alternative", "journaal24.png", "/nos/journaal24-", "Via het
themakanaal 'Journaal 24' kunnen de live televisieuitzendingen van het NOS
Journaal worden gevolgd. De laatste Journaaluitzending wordt herhaald tot de
volgende uitzending van het NOS Journaal.", "230"],
- ["Politiek 24 alternative", "politiek24.png", "/nos/politiek24-", "Politiek
24 is het digitale kanaal over de Nederlandse politiek in de breedste zin van
het woord.", "247"],
- ["Spirit 24", "spirit24.png", "/npo/spirit24-", "Spirit 24 is interreligieus
en multicultureel en biedt de kijker een breed aanbod van onderwerpen op het
gebied van spiritualiteit, levensbeschouwing, zingeving, cultuur en filosofie,
gezien vanuit verschillende geloofsrichtingen en invalshoeken. Spirit 24 laat
de kijker genieten en brengt op toegankelijke wijze (nieuwe) inzichten!",
"255"],
- ["Sterren 24", "sterren24.png", "/npo/sterren24-", "Op Sterren 24 zijn de
beste Nederlandse artiesten te bewonderen en te beluisteren. Naast clips en
uitzendingen uit het rijke TROS-archief is er ruimte voor nieuw materiaal en
bieden ze aanstormend Nederlands muziektalent een podium op 24-uurs
muziekzender Sterren 24.", "249"]
+ ["Humor TV 24", "humortv24.png", "/npo/humortv24-", "Humor TV 24 is een
uitgesproken comedykanaal: een frisse, Nederlandse humorzender met
hoogwaardige, grappige, scherpe, jonge, nieuwe, satirische, humoristische
programma's.", "241"]
]
-
+
for channel in CHANNELS:
- if settings.getSetting( channel[0] )=='true' and settings.getSetting(
"GEOIP" )=='false':
- addLink(channel[0],(BASE_URL+channel[2]+REZ), os.path.join(IMG_DIR,
channel[1]), channel[3], channel[4])
- elif settings.getSetting( channel[0] )=='false':
- print ""
- else:
- print ""
-
-
-
-xbmcplugin.endOfDirectory(handle)
+ if settings.getSetting( channel[0] )=='true' and settings.getSetting(
"GEOIP" )=='false':
+ addLink(channel[0],(BASE_URL+channel[2]+REZ), os.path.join(IMG_DIR,
channel[1]), channel[3], channel[4])
+ elif settings.getSetting( channel[0] )=='false':
+ print ""
+ else:
+ print ""
+xbmcplugin.endOfDirectory(handle)
diff --git a/plugin.video.nederland24/resources/language/Dutch/strings.xml
b/plugin.video.nederland24/resources/language/Dutch/strings.xml
index 4cb524d..d275d53 100644
--- a/plugin.video.nederland24/resources/language/Dutch/strings.xml
+++ b/plugin.video.nederland24/resources/language/Dutch/strings.xml
@@ -5,18 +5,16 @@
<!--Channels-->
<string id="30101">101 TV</string>
<string id="30102">Best 24</string>
- <string id="30103">News Ticker</string>
<string id="30104">Cultura 24</string>
<string id="30105">Familie 24 / Z@ppelin</string>
<string id="30107">Holland Doc 24</string>
<string id="30108">Humor TV 24</string>
<string id="30109">Journaal 24</string>
<string id="30110">Politiek 24</string>
- <string id="30111">Spirit 24</string>
- <string id="30112">Sterren 24</string>
<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 1967cc8..eb72868 100644
--- a/plugin.video.nederland24/resources/language/English/strings.xml
+++ b/plugin.video.nederland24/resources/language/English/strings.xml
@@ -4,19 +4,17 @@
<string id="30200">General</string>
<!--Channels-->
<string id="30101">101 TV</string>
- <string id="30102">Best 24</string>
- <string id="30103">News Ticker</string>
+ <string id="30102">Best 24</string>
<string id="30104">Cultura 24</string>
<string id="30105">Familie 24 / Z@ppelin</string>
<string id="30107">Holland Doc 24</string>
<string id="30108">Humor TV 24</string>
<string id="30109">Journaal 24</string>
<string id="30110">Politiek 24</string>
- <string id="30111">Spirit 24</string>
- <string id="30112">Sterren 24</string>
<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 13393d0..c82ae36 100644
--- a/plugin.video.nederland24/resources/settings.xml
+++ b/plugin.video.nederland24/resources/settings.xml
@@ -4,18 +4,16 @@
<category label="30100">
<setting id="101 TV" label="30101" type="bool" default="true" />
<setting id="Best 24" label="30102" type="bool" default="true" />
- <setting id="News Ticker" label="30103" type="bool" default="false" />
<setting id="Cultura 24" label="30104" type="bool" default="true" />
<setting id="Familie 24 / Z@ppelin" label="30105" type="bool"
default="true" />
<setting id="Holland Doc 24" label="30107" type="bool" default="true"
/>
<setting id="Humor TV 24" label="30108" type="bool" default="true" />
<setting id="Journaal 24" label="30109" type="bool" default="true" />
<setting id="Politiek 24" label="30110" type="bool" default="true" />
- <setting id="Spirit 24" label="30111" type="bool" default="false" />
- <setting id="Sterren 24" label="30112" type="bool" default="true" />
<!-- <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 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.filmon/addon.xml | 2 +-
plugin.video.filmon/changelog.txt | 3 +
plugin.video.filmon/default.py | 49 +++---
plugin.video.manoto/addon.xml | 2 +-
plugin.video.manoto/default.py | 15 +--
plugin.video.nederland24/addon.xml | 8 +-
plugin.video.nederland24/changelog.txt | 20 ++-
plugin.video.nederland24/fanart.jpg | Bin 0 -> 92491 bytes
plugin.video.nederland24/nederland24.py | 181 +++++++++++---------
.../resources/language/Dutch/strings.xml | 4 +-
.../resources/language/English/strings.xml | 6 +-
.../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 | 8 +-
plugin.video.vgtv/addon.py | 2 +-
plugin.video.vgtv/addon.xml | 4 +-
plugin.video.vgtv/changelog.txt | 6 +
plugin.video.vgtv/resources/lib/api.py | 5 +-
plugin.video.vgtv/resources/lib/utils.py | 26 ++--
20 files changed, 187 insertions(+), 154 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. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
