The branch, frodo has been updated
       via  405b48ba58490342530215fffeb635c3af87fc09 (commit)
      from  db69cca01d5c05778b99785f872901a614860480 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=405b48ba58490342530215fffeb635c3af87fc09

commit 405b48ba58490342530215fffeb635c3af87fc09
Author: beenje <[email protected]>
Date:   Thu Aug 29 21:05:59 2013 +0200

    [plugin.video.nrk] updated to version 4.4.9

diff --git a/plugin.video.nrk/addon.xml b/plugin.video.nrk/addon.xml
index a2d57ec..72eee5d 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.8"
+       version="4.4.9"
        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 e461a28..7e7a5a8 100644
--- a/plugin.video.nrk/changelog.txt
+++ b/plugin.video.nrk/changelog.txt
@@ -1,3 +1,6 @@
+[B]4.4.9[/B]
+- Sideendringer
+
 [B]4.4.8[/B]
 - Fikset direktestrømmer. Siden de endres så ofte, blir de nå hentet på 
nytt hver gang i stedet
 
diff --git a/plugin.video.nrk/default.py b/plugin.video.nrk/default.py
index aa43467..2af95e6 100644
--- a/plugin.video.nrk/default.py
+++ b/plugin.video.nrk/default.py
@@ -142,7 +142,7 @@ def seasons(arg):
     return plugin.redirect(urls[0])
   view(titles, urls, thumbs=thumbs, bgs=bgs)
 
[email protected]('/program/Episodes/<series_id>/<season_id>')
[email protected]('/program/Episodes/<series_id>/<path:season_id>')
 def episodes(series_id, season_id):
   import data
   view(*data.get_episodes(series_id, season_id))
diff --git a/plugin.video.nrk/plugin.py b/plugin.video.nrk/plugin.py
index 6567cb8..a416f0e 100644
--- a/plugin.video.nrk/plugin.py
+++ b/plugin.video.nrk/plugin.py
@@ -61,7 +61,10 @@ class Plugin(object):
 class UrlRule(object):
   def __init__(self, url_rule, view_func):
     self._view_func = view_func
-    p = url_rule.replace('<', '(?P<').replace('>', '>[^/]+?)')
+    p = re.sub('<([A-z]*)>', '<string:\\1>', url_rule)
+    
+    p = re.sub('<string:([A-z]+)>', '(?P<\\1>[^/]+?)', p)
+    p = re.sub('<path:([A-z]+)>', '(?P<\\1>.*)', p)
     self._regex = re.compile('^' + p + '$')
   
   def match(self, path):

-----------------------------------------------------------------------

Summary of changes:
 plugin.video.nrk/addon.xml     |    2 +-
 plugin.video.nrk/changelog.txt |    3 +++
 plugin.video.nrk/default.py    |    2 +-
 plugin.video.nrk/plugin.py     |    5 ++++-
 4 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to