The branch, frodo has been updated
       via  b56625ab0741b0673e48b4241d7d6dc3753f919c (commit)
      from  9e6bc37627e424d7982d92bd6d6f0e7ed6c4e4b7 (commit)

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

commit b56625ab0741b0673e48b4241d7d6dc3753f919c
Author: beenje <bee...@xbmc.org>
Date:   Tue Jan 21 14:42:03 2014 +0100

    [plugin.video.sbview] updated to version 0.0.2

diff --git a/plugin.video.sbview/addon.xml b/plugin.video.sbview/addon.xml
index c8fd1e1..d8a1328 100644
--- a/plugin.video.sbview/addon.xml
+++ b/plugin.video.sbview/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.sbview" name="SB View" version="0.0.1" 
provider-name="null_pointer">
+<addon id="plugin.video.sbview" name="SB View" version="0.0.2" 
provider-name="null_pointer">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
   </requires>
diff --git a/plugin.video.sbview/default.py b/plugin.video.sbview/default.py
index fc0a9f7..55c39fc 100644
--- a/plugin.video.sbview/default.py
+++ b/plugin.video.sbview/default.py
@@ -236,12 +236,24 @@ def get_sb_url():
     port = xbmcplugin.getSetting(handle, "port")
     sbUrl += ":" + port    
     
-    sbUrl += "/api/"
+    web_root = xbmcplugin.getSetting(handle, "web_root").strip()
+    if (len(web_root) > 0):
+        if(web_root[0:1] != "/"):
+            web_root = "/" + web_root
+        if(web_root[len(web_root)-1:] != "/"):
+             web_root = "/"
+        sbUrl += web_root
+    else:
+        web_root = "/"
+        sbUrl += web_root
+    
+    sbUrl += "api/"
     
     guid = xbmcplugin.getSetting(handle, "guid")
     
     sbUrl += guid + "/"
     
+    xbmc.log(sbUrl)
     return sbUrl
     
 def get_thumbnail_url(show_id):
@@ -260,7 +272,7 @@ def view_future():
     
     data = result.get('data')
     if(data == None):
-        data = []
+        data = {}
     
     # process the missed
     missed = data.get('missed')
diff --git a/plugin.video.sbview/resources/language/english/strings.xml 
b/plugin.video.sbview/resources/language/english/strings.xml
index 5a534f2..334c36d 100644
--- a/plugin.video.sbview/resources/language/english/strings.xml
+++ b/plugin.video.sbview/resources/language/english/strings.xml
@@ -6,6 +6,7 @@
     <string id="30012">Port</string>
        <string id="30013">GUID</string>
     <string id="30014">Protocol</string>
+    <string id="30015">WebRoot</string>
     
     <string id="30110">Shows</string>
     <string id="30111">Future</string>
diff --git a/plugin.video.sbview/resources/settings.xml 
b/plugin.video.sbview/resources/settings.xml
index 8ad4647..cd4af1c 100644
--- a/plugin.video.sbview/resources/settings.xml
+++ b/plugin.video.sbview/resources/settings.xml
@@ -5,5 +5,6 @@
     <setting id="host" type="text" label="30011" default="" />
     <setting id="port" type="number" label="30012" default="" />
     <setting id="guid" type="text" label="30013" default="" />
+    <setting id="web_root" type="text" label="30015" default="/" />
 </settings>
 

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

Summary of changes:
 plugin.video.sbview/addon.xml                      |    2 +-
 plugin.video.sbview/default.py                     |   16 ++++++++++++++--
 .../resources/language/english/strings.xml         |    1 +
 plugin.video.sbview/resources/settings.xml         |    1 +
 4 files changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Plugins

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to