The branch, frodo has been updated
via ca653b291ae3f9390723eaddabea17a49a4a1213 (commit)
from 960d3db28bd93c7b8c73e3a66cbd7371bb6c666f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ca653b291ae3f9390723eaddabea17a49a4a1213
commit ca653b291ae3f9390723eaddabea17a49a4a1213
Author: Martijn Kaijser <[email protected]>
Date: Sat May 17 18:58:30 2014 +0200
[service.skin.widgets] 0.0.29
diff --git a/service.skin.widgets/addon.xml b/service.skin.widgets/addon.xml
index 6b0c116..7772336 100644
--- a/service.skin.widgets/addon.xml
+++ b/service.skin.widgets/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="service.skin.widgets" name="Skin Widgets" version="0.0.28"
provider-name="Martijn, phil65">
+<addon id="service.skin.widgets" name="Skin Widgets" version="0.0.29"
provider-name="Martijn, phil65">
<requires>
<import addon="xbmc.addon" version="12.0.0"/>
<import addon="xbmc.json" version="6.0.0"/>
diff --git a/service.skin.widgets/changelog.txt
b/service.skin.widgets/changelog.txt
index a0eac0a..c63a990 100644
--- a/service.skin.widgets/changelog.txt
+++ b/service.skin.widgets/changelog.txt
@@ -1,3 +1,6 @@
+v0.0.29
+- Fix script error on XBMC Helix due to empty array
+
v0.0.27
- Fix setting properties reload on settings change
diff --git a/service.skin.widgets/default.py b/service.skin.widgets/default.py
index cd2c5c7..683edbc 100644
--- a/service.skin.widgets/default.py
+++ b/service.skin.widgets/default.py
@@ -199,13 +199,21 @@ class Main:
play = 'XBMC.RunScript(' + __addonid__ + ',movieid=' +
str(item.get('movieid')) + ')'
streaminfo =
media_streamdetails(item['file'].encode('utf-8').lower(),
item['streamdetails'])
+ if len(item['studio']) > 0:
+ studio = item['studio'][0]
+ else:
+ studio = ""
+ if len(item['country']) > 0:
+ country = item['country'][0]
+ else:
+ country = ""
self.WINDOW.setProperty("%s.%d.DBID" % (request,
count), str(item.get('movieid')))
self.WINDOW.setProperty("%s.%d.Title" %
(request, count), item['title'])
self.WINDOW.setProperty("%s.%d.OriginalTitle" %
(request, count), item['originaltitle'])
self.WINDOW.setProperty("%s.%d.Year" %
(request, count), str(item['year']))
self.WINDOW.setProperty("%s.%d.Genre" %
(request, count), " / ".join(item['genre']))
- self.WINDOW.setProperty("%s.%d.Studio" %
(request, count), item.get('studio'))
- self.WINDOW.setProperty("%s.%d.Country" %
(request, count), item.get('country'))
+ self.WINDOW.setProperty("%s.%d.Studio" %
(request, count), studio)
+ self.WINDOW.setProperty("%s.%d.Country" %
(request, count), country)
self.WINDOW.setProperty("%s.%d.Plot" %
(request, count), plot)
self.WINDOW.setProperty("%s.%d.PlotOutline" %
(request, count), item['plotoutline'])
self.WINDOW.setProperty("%s.%d.Tagline" %
(request, count), item['tagline'])
@@ -277,6 +285,10 @@ class Main:
play = 'XBMC.RunScript(' + __addonid__ + ',episodeid=' +
str(item2.get('episodeid')) + ')'
streaminfo =
media_streamdetails(item['file'].encode('utf-8').lower(),
item2['streamdetails'])
+ if len(item['studio']) > 0:
+ studio = item['studio'][0]
+ else:
+ studio = ""
self.WINDOW.setProperty("%s.%d.DBID" %
(request, count), str(item2.get('episodeid')))
self.WINDOW.setProperty("%s.%d.Title" %
(request, count), item2['title'])
self.WINDOW.setProperty("%s.%d.Episode" %
(request, count), episode)
@@ -296,7 +308,7 @@ class Main:
self.WINDOW.setProperty("%s.%d.Art(tvshow.landscape)"%
(request, count), art2.get('tvshow.landscape',''))
self.WINDOW.setProperty("%s.%d.Art(tvshow.characterart)"%
(request, count), art2.get('tvshow.characterart',''))
#self.WINDOW.setProperty("%s.%d.Art(season.poster)" %
(request, count), seasonthumb)
- self.WINDOW.setProperty("%s.%d.Studio" %
(request, count), item.get('studio'))
+ self.WINDOW.setProperty("%s.%d.Studio" %
(request, count), studio)
self.WINDOW.setProperty("%s.%d.mpaa" %
(request, count), item['mpaa'])
self.WINDOW.setProperty("%s.%d.Resume" %
(request, count), resume)
self.WINDOW.setProperty("%s.%d.PercentPlayed" %
(request, count), played)
-----------------------------------------------------------------------
Summary of changes:
service.skin.widgets/addon.xml | 2 +-
service.skin.widgets/changelog.txt | 3 +++
service.skin.widgets/default.py | 18 +++++++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
