The branch, frodo has been updated
via 30d3b6a7a8bf307e590e97389ddf1eda53deced1 (commit)
from c47b353e25ed036aa7c18ff22b9aec5bafe57657 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=30d3b6a7a8bf307e590e97389ddf1eda53deced1
commit 30d3b6a7a8bf307e590e97389ddf1eda53deced1
Author: kibje <k...@xbmc.org>
Date: Mon Jul 1 09:11:03 2013 +0200
[plugin.video.nrk] updated to version 4.4.8
diff --git a/plugin.video.nrk/addon.xml b/plugin.video.nrk/addon.xml
index 02a84c5..a2d57ec 100644
--- a/plugin.video.nrk/addon.xml
+++ b/plugin.video.nrk/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nrk"
name="NRK Nett-TV"
- version="4.4.7"
+ version="4.4.8"
provider-name="takoi">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.nrk/changelog.txt b/plugin.video.nrk/changelog.txt
index 9363c11..e461a28 100644
--- a/plugin.video.nrk/changelog.txt
+++ b/plugin.video.nrk/changelog.txt
@@ -1,3 +1,6 @@
+[B]4.4.8[/B]
+- Fikset direktestrømmer. Siden de endres så ofte, blir de nå hentet på
nytt hver gang i stedet
+
[B]4.4.7[/B]
- Fikset direktestrømmer
diff --git a/plugin.video.nrk/data.py b/plugin.video.nrk/data.py
index 44abd6a..63e4ea7 100644
--- a/plugin.video.nrk/data.py
+++ b/plugin.video.nrk/data.py
@@ -31,6 +31,7 @@ session.headers['User-Agent'] = 'xbmc.org'
xhrsession = requests.session()
xhrsession.headers['User-Agent'] = 'xbmc.org'
xhrsession.headers['X-Requested-With'] = 'XMLHttpRequest'
+xhrsession.headers['Cookie'] =
"NRK_PLAYER_SETTINGS_TV=devicetype=desktop&preferred-player-odm=hlslink&preferred-player-live=hlslink"
def get_by_letter(arg):
@@ -61,6 +62,13 @@ def _parse_list(html):
return titles, urls, thumbs, fanart
+def get_live_stream(ch):
+ url = "http://tv.nrk.no/direkte/nrk%s"; % ch
+ html = xhrsession.get(url).text
+ url = parseDOM(html, 'div', {'id':'playerelement'}, ret='data-media')[0]
+ img = parseDOM(html, 'img', {'class':'poster'}, ret='src')[0]
+ return url, img
+
def get_recommended():
url = "http://tv.nrk.no/";
html = xhrsession.get(url).text
diff --git a/plugin.video.nrk/default.py b/plugin.video.nrk/default.py
index cd30551..aa43467 100644
--- a/plugin.video.nrk/default.py
+++ b/plugin.video.nrk/default.py
@@ -39,9 +39,11 @@ def view_top():
@plugin.route('/live')
def live():
- add("NRK 1", "http://nrk1-i.akamaihd.net/hls/live/213271/nrk1/master.m3u8";,
"application/vnd.apple.mpegurl", "nrk1.png")
- add("NRK 2", "http://nrk2-i.akamaihd.net/hls/live/213272/nrk2/master.m3u8";,
"application/vnd.apple.mpegurl", "nrk2.png")
- add("NRK 3", "http://nrk3-i.akamaihd.net/hls/live/213273/nrk3/master.m3u8";,
"application/vnd.apple.mpegurl", "nrk3.png")
+ import data
+ res = os.path.join(plugin.path, "resources/images")
+ for ch in [1,2,3]:
+ url, fanart = data.get_live_stream(ch)
+ add("NRK %s" % ch, url, "application/vnd.apple.mpegurl", os.path.join(res,
"nrk%d.png" % ch), fanart)
add("NRK P1", "http://lyd.nrk.no/nrk_radio_p1_ostlandssendingen_mp3_h";,
"audio/mpeg")
add("NRK P2", "http://lyd.nrk.no/nrk_radio_p2_mp3_h";, "audio/mpeg")
add("NRK P3", "http://lyd.nrk.no/nrk_radio_p3_mp3_h";, "audio/mpeg")
@@ -58,12 +60,10 @@ def live():
add("Super", "http://lyd.nrk.no/nrk_radio_super_mp3_h";, "audio/mpeg")
endOfDirectory(plugin.handle)
-def add(title, url, mimetype, thumb=""):
- if thumb:
- img_path = os.path.join(plugin.path, "resources/images")
- thumb = os.path.join(img_path, thumb)
+def add(title, url, mimetype, thumb="", fanart=""):
li = ListItem(title, thumbnailImage=thumb)
li.setProperty('mimetype', mimetype)
+ li.setProperty('fanart_image', fanart)
addDirectoryItem(plugin.handle, url, li, False)
def view(titles, urls, thumbs=repeat(''), bgs=repeat(''), descr=repeat(''),
update_listing=False):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nrk/addon.xml | 2 +-
plugin.video.nrk/changelog.txt | 3 +++
plugin.video.nrk/data.py | 8 ++++++++
plugin.video.nrk/default.py | 14 +++++++-------
4 files changed, 19 insertions(+), 8 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
