The branch, frodo has been updated
via 04515787855f76b0620ac87ba89de65f96f10b25 (commit)
from 79e526b0e4eb8543fac4384f3cd7f16ea0cf2fa2 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=04515787855f76b0620ac87ba89de65f96f10b25
commit 04515787855f76b0620ac87ba89de65f96f10b25
Author: Martijn Kaijser <[email protected]>
Date: Fri Aug 1 18:04:09 2014 +0200
[plugin.video.nrk] 4.4.16
diff --git a/plugin.video.nrk/addon.xml b/plugin.video.nrk/addon.xml
index 5dd4ff4..695a9c0 100644
--- a/plugin.video.nrk/addon.xml
+++ b/plugin.video.nrk/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nrk"
name="NRK Nett-TV"
- version="4.4.15"
+ version="4.4.16"
provider-name="takoi">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.parsedom" version="0.9.2"/>
- <import addon="script.module.requests2" version="2.2.1"/>
+ <import addon="script.module.requests" version="1.0.4"/>
<import addon="script.common.plugin.cache" version="1.1.0"/>
</requires>
<extension point="xbmc.python.pluginsource" library="default.py">
diff --git a/plugin.video.nrk/changelog.txt b/plugin.video.nrk/changelog.txt
index 6582141..be0d7ef 100644
--- a/plugin.video.nrk/changelog.txt
+++ b/plugin.video.nrk/changelog.txt
@@ -1,3 +1,6 @@
+[B]4.4.16[/B]
+- Sideendringer
+
[B]4.4.15[/B]
- Lagt til "Populært siste måned"
- Fikset søk
diff --git a/plugin.video.nrk/default.py b/plugin.video.nrk/default.py
index ecaaf2c..3684d77 100644
--- a/plugin.video.nrk/default.py
+++ b/plugin.video.nrk/default.py
@@ -190,6 +190,7 @@ def episodes(series_id, season_id):
view(nrktv.get_episodes(series_id, season_id))
[email protected]('/serie/<series_id>/<video_id>')
@plugin.route('/serie/<series_id>/<video_id>/.*')
@plugin.route('/program/<video_id>')
@plugin.route('/program/<video_id>/.*')
diff --git a/plugin.video.nrk/nrktv.py b/plugin.video.nrk/nrktv.py
index d1b0c4d..5d66d03 100644
--- a/plugin.video.nrk/nrktv.py
+++ b/plugin.video.nrk/nrktv.py
@@ -15,16 +15,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import json
import requests
import HTMLParser
-import StorageServer
import CommonFunctions as common
from itertools import repeat
html_decode = HTMLParser.HTMLParser().unescape
parseDOM = common.parseDOM
-cache = StorageServer.StorageServer('nrk.no', 336)
session = requests.Session()
session.headers['User-Agent'] = 'xbmc.org'
@@ -177,30 +174,9 @@ def get_media_url(video_id):
return session.get(url).json()['mediaUrl']
-def _get_cached_json(url, node):
- data = cache.get(url)
- if data:
- try:
- return json.loads(data)[node]
- except: # cache might be broken
- pass
- data = session.get(url).text
- cache.delete(url)
- cache.set(url, data)
- return json.loads(data)[node]
-
-
def _thumb_url(id):
return "http://nrk.eu01.aws.af.cm/t/%s"; % id.strip('/')
def _fanart_url(id):
return "http://nrk.eu01.aws.af.cm/f/%s"; % id.strip('/')
-
-
-def _get_descr(url):
- url = "http://v7.psapi.nrk.no/mediaelement/%s"; % url.split('/')[3]
- try:
- return _get_cached_json(url, 'description')
- except:
- return ""
diff --git a/plugin.video.nrk/routing.py b/plugin.video.nrk/routing.py
index 85f62c4..d99f05d 100644
--- a/plugin.video.nrk/routing.py
+++ b/plugin.video.nrk/routing.py
@@ -112,7 +112,7 @@ class UrlRule(object):
if args and kwargs:
raise ValueError("can't use both args and kwargs")
if args:
- return re.sub(r'{[A-z]+}', r'{}', self._url_format).format(*args)
+ return re.sub(r'{[A-z]+}', r'%s', self._url_format) % args
url_args = dict(((k, v) for k, v in kwargs.items() if k in
self._keywords))
qs_args = dict(((k, v) for k, v in kwargs.items() if k not in
self._keywords))
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nrk/addon.xml | 4 ++--
plugin.video.nrk/changelog.txt | 3 +++
plugin.video.nrk/default.py | 1 +
plugin.video.nrk/nrktv.py | 24 ------------------------
plugin.video.nrk/routing.py | 2 +-
5 files changed, 7 insertions(+), 27 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
