The branch, eden has been updated
via bd017a8171dd1df7d415dbeb95cfd531501615b3 (commit)
from 71bd554c1d9d0f694a4a1c1772047793daa1b360 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=bd017a8171dd1df7d415dbeb95cfd531501615b3
commit bd017a8171dd1df7d415dbeb95cfd531501615b3
Author: spiff <[email protected]>
Date: Tue Oct 2 09:59:14 2012 +0200
[plugin.video.nrk] updated to version 4.2.1
diff --git a/plugin.video.nrk/addon.xml b/plugin.video.nrk/addon.xml
index 1226c90..895f1b8 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.2.0"
+ version="4.2.1"
provider-name="takoi">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.nrk/changelog.txt b/plugin.video.nrk/changelog.txt
index 6132e0b..e4670df 100644
--- a/plugin.video.nrk/changelog.txt
+++ b/plugin.video.nrk/changelog.txt
@@ -1,3 +1,7 @@
+[B]4.2.1[/B]
+- Fikset direktestrømmer
+- Fikset undertekst
+
[B]4.2.0[/B]
- Støtte for fanart/miniatyrer
- Direktestrømmer er nå i HD
diff --git a/plugin.video.nrk/data.py b/plugin.video.nrk/data.py
index 32fa8fb..cc48665 100644
--- a/plugin.video.nrk/data.py
+++ b/plugin.video.nrk/data.py
@@ -51,6 +51,7 @@ def parse_categories():
def _parse_list(html):
titles = parseDOM(html, 'a')
+ titles = [ re.sub('<[^>]*>', '', t) for t in titles ]
titles = map(html_decode, titles)
urls = parseDOM(html, 'a', ret='href')
thumbs = [ _thumb_url(url) for url in urls ]
diff --git a/plugin.video.nrk/default.py b/plugin.video.nrk/default.py
index ad5a965..d103a2a 100644
--- a/plugin.video.nrk/default.py
+++ b/plugin.video.nrk/default.py
@@ -43,9 +43,9 @@ def view_top():
def live():
b = ['380','659','1394','2410','3660'][BITRATE-1]
img_path = os.path.join(ADDON_PATH, "resources/images")
- add("NRK 1",
"http://nrk1us-f.akamaihd.net/i/nrk1us_0@79328/index_%s_av-b.m3u8?sd=10&rebase=on";
% b,os.path.join(img_path, "nrk1.png"))
- add("NRK 2",
"http://nrk2us-f.akamaihd.net/i/nrk2us_0@79327/index_%s_av-b.m3u8?sd=10&rebase=on";
% b, os.path.join(img_path, "nrk2.png"))
- add("NRK 3",
"http://nrk3us-f.akamaihd.net/i/nrk3us_0@79326/index_%s_av-b.m3u8?sd=10&rebase=on";
% b, os.path.join(img_path, "nrk3.png"))
+ add("NRK 1",
"http://nrk1us-f.akamaihd.net/i/nrk1us_0@79328/index_%s_av-p.m3u8?sd=10&rebase=on";
% b,os.path.join(img_path, "nrk1.png"))
+ add("NRK 2",
"http://nrk2us-f.akamaihd.net/i/nrk2us_0@79327/index_%s_av-p.m3u8?sd=10&rebase=on";
% b, os.path.join(img_path, "nrk2.png"))
+ add("NRK 3",
"http://nrk3us-f.akamaihd.net/i/nrk3us_0@79326/index_%s_av-p.m3u8?sd=10&rebase=on";
% b, os.path.join(img_path, "nrk3.png"))
endOfDirectory(plugin.handle)
def add(title, url, thumb=""):
@@ -127,10 +127,11 @@ def play(video_id, series_id=""):
xbmcplugin.setResolvedUrl(plugin.handle, True, ListItem(path=url))
player = xbmc.Player()
subtitle = data.get_subtitles(video_id)
- #Wait for stream to start
- start_time = time.time()
- while not player.isPlaying() and time.time() - start_time < 10:
- time.sleep(1.)
+ if subtitle:
+ #Wait for stream to start
+ start_time = time.time()
+ while not player.isPlaying() and time.time() - start_time < 10:
+ time.sleep(1.)
player.setSubtitles(subtitle)
if not SHOW_SUBS:
player.showSubtitles(False)
diff --git a/plugin.video.nrk/subs.py b/plugin.video.nrk/subs.py
index cdd9b27..aa55050 100644
--- a/plugin.video.nrk/subs.py
+++ b/plugin.video.nrk/subs.py
@@ -21,22 +21,24 @@ requests =
requests.session(headers={'User-Agent':'xbmc.org'})
def get_subtitles(video_id):
- filename = os.path.join(xbmc.translatePath("special://temp"),'nrk.srt')
- f = open(filename, 'w')
html = requests.get("http://tv.nrk.no/programsubtitles/%s"; % video_id).text
- parts = re.compile(r'<p begin="(.*?)"
dur="(.*?)".*?>(.*?)</p>',re.DOTALL).findall(html)
- i = 0
- for begint, dur, contents in parts:
- begin = _stringToTime(begint)
- dur = _stringToTime(dur)
- end = begin+dur
- i += 1
- f.write(str(i))
- f.write('\n%s' % _timeToString(begin))
- f.write(' --> %s\n' % _timeToString(end))
- f.write(re.sub('<br></br>\s*','\n',' '.join(contents.replace('<span
style="italic">','<i>').replace('</span>','</i>').split())).encode('utf-8'))
- f.write('\n\n')
- f.close()
+ if not html:
+ return None
+
+ filename = os.path.join(xbmc.translatePath("special://temp"),'nrk.srt')
+ with open(filename, 'w') as f:
+ parts = re.compile(r'<p begin="(.*?)"
dur="(.*?)".*?>(.*?)</p>',re.DOTALL).findall(html)
+ i = 0
+ for begint, dur, contents in parts:
+ begin = _stringToTime(begint)
+ dur = _stringToTime(dur)
+ end = begin+dur
+ i += 1
+ f.write(str(i))
+ f.write('\n%s' % _timeToString(begin))
+ f.write(' --> %s\n' % _timeToString(end))
+ f.write(re.sub('<br></br>\s*','\n',' '.join(contents.replace('<span
style="italic">','<i>').replace('</span>','</i>').split())).encode('utf-8'))
+ f.write('\n\n')
return filename
def _stringToTime(txt):
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nrk/addon.xml | 2 +-
plugin.video.nrk/changelog.txt | 4 ++++
plugin.video.nrk/data.py | 1 +
plugin.video.nrk/default.py | 15 ++++++++-------
plugin.video.nrk/subs.py | 32 +++++++++++++++++---------------
5 files changed, 31 insertions(+), 23 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
