The branch, eden has been updated
via d3471542016c4f0b3a6827901a230dfa4d8866a8 (commit)
from 168f35c4507d9a33de0271d67907d9870967df9c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d3471542016c4f0b3a6827901a230dfa4d8866a8
commit d3471542016c4f0b3a6827901a230dfa4d8866a8
Author: ronie <[email protected]>
Date: Sat Mar 24 14:34:55 2012 +0100
[script.artworkorganizer] -v0.1.10
check for json NONE response
diff --git a/script.artworkorganizer/addon.xml
b/script.artworkorganizer/addon.xml
index 04b1a17..a873ac4 100644
--- a/script.artworkorganizer/addon.xml
+++ b/script.artworkorganizer/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.artworkorganizer" name="Artwork Organizer" version="0.1.9"
provider-name="ronie">
+<addon id="script.artworkorganizer" name="Artwork Organizer" version="0.1.10"
provider-name="ronie">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.artworkorganizer/changelog.txt
b/script.artworkorganizer/changelog.txt
index af65196..ac33e89 100644
--- a/script.artworkorganizer/changelog.txt
+++ b/script.artworkorganizer/changelog.txt
@@ -1,3 +1,6 @@
+v0.1.10
+- check for empty json response
+
v0.1.9
- use label for seasons
- fix progressbars
diff --git a/script.artworkorganizer/default.py
b/script.artworkorganizer/default.py
index 8e9cd4b..bfc091d 100644
--- a/script.artworkorganizer/default.py
+++ b/script.artworkorganizer/default.py
@@ -158,10 +158,10 @@ class Main:
def _copy_moviefanart( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovies", "params": {"properties": ["title", "fanart", "year"]
}, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovies", "params": {"properties": ["title", "fanart",
"year"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('movies'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('movies')):
totalitems = len( json_response['result']['movies'] )
for item in json_response['result']['movies']:
if self.dialog.iscanceled():
@@ -188,10 +188,10 @@ class Main:
def _copy_tvshowfanart( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["title", "fanart"] },
"id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["title", "fanart"]}, "id":
1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('tvshows'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('tvshows')):
totalitems = len( json_response['result']['tvshows'] )
for item in json_response['result']['tvshows']:
if self.dialog.iscanceled():
@@ -217,10 +217,10 @@ class Main:
def _copy_musicvideofanart( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMusicVideos", "params": {"properties": ["title", "fanart",
"artist"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMusicVideos", "params": {"properties": ["title", "fanart",
"artist"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('musicvideos'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('musicvideos')):
totalitems = len( json_response['result']['musicvideos'] )
for item in json_response['result']['musicvideos']:
if self.dialog.iscanceled():
@@ -247,10 +247,10 @@ class Main:
def _copy_artistfanart( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetArtists", "params": {"properties": ["fanart"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetArtists", "params": {"properties": ["fanart"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('artists'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('artists')):
totalitems = len( json_response['result']['artists'] )
for item in json_response['result']['artists']:
if self.dialog.iscanceled():
@@ -276,10 +276,10 @@ class Main:
def _copy_moviethumbs( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovies", "params": {"properties": ["title", "thumbnail",
"year"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovies", "params": {"properties": ["title", "thumbnail",
"year"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('movies'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('movies')):
totalitems = len( json_response['result']['movies'] )
for item in json_response['result']['movies']:
if self.dialog.iscanceled():
@@ -306,10 +306,10 @@ class Main:
def _copy_tvshowthumbs( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["title", "thumbnail"] },
"id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["title", "thumbnail"]},
"id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('tvshows'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('tvshows')):
totalitems = len( json_response['result']['tvshows'] )
for item in json_response['result']['tvshows']:
if self.dialog.iscanceled():
@@ -338,7 +338,7 @@ class Main:
json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('tvshows'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('tvshows')):
for item in json_response['result']['tvshows']:
if self.dialog.iscanceled():
log('script cancelled')
@@ -347,10 +347,10 @@ class Main:
tvshowids.append(tvshowid)
for tvshowid in tvshowids:
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetSeasons", "params": {"properties": ["thumbnail", "showtitle"],
"tvshowid":%s }, "id": 1}' % tvshowid)
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetSeasons", "params": {"properties": ["thumbnail", "showtitle"],
"tvshowid":%s}, "id": 1}' % tvshowid)
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('seasons'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('seasons')):
totalitems = len( json_response['result']['seasons'] )
for item in json_response['result']['seasons']:
if self.dialog.iscanceled():
@@ -377,10 +377,10 @@ class Main:
def _copy_episodethumbs( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetEpisodes", "params": {"properties": ["title", "thumbnail",
"season", "episode", "showtitle"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetEpisodes", "params": {"properties": ["title", "thumbnail",
"season", "episode", "showtitle"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('episodes'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('episodes')):
totalitems = len( json_response['result']['episodes'] )
for item in json_response['result']['episodes']:
if self.dialog.iscanceled():
@@ -410,10 +410,10 @@ class Main:
def _copy_musicvideothumbs( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMusicVideos", "params": {"properties": ["title", "thumbnail",
"artist"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMusicVideos", "params": {"properties": ["title", "thumbnail",
"artist"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('musicvideos'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('musicvideos')):
totalitems = len( json_response['result']['musicvideos'] )
for item in json_response['result']['musicvideos']:
if self.dialog.iscanceled():
@@ -440,10 +440,10 @@ class Main:
def _copy_artistthumbs( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetArtists", "params": {"properties": ["thumbnail"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetArtists", "params": {"properties": ["thumbnail"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('artists'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('artists')):
totalitems = len( json_response['result']['artists'] )
for item in json_response['result']['artists']:
if self.dialog.iscanceled():
@@ -469,10 +469,10 @@ class Main:
def _copy_albumthumbs( self ):
count = 0
processeditems = 0
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetAlbums", "params": {"properties": ["title", "thumbnail",
"artist"] }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetAlbums", "params": {"properties": ["title", "thumbnail",
"artist"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response['result'].has_key('albums'):
+ if (json_response['result'] != None) and
(json_response['result'].has_key('albums')):
totalitems = len( json_response['result']['albums'] )
for item in json_response['result']['albums']:
if self.dialog.iscanceled():
-----------------------------------------------------------------------
Summary of changes:
script.artworkorganizer/addon.xml | 2 +-
script.artworkorganizer/changelog.txt | 3 ++
script.artworkorganizer/default.py | 46 ++++++++++++++++----------------
3 files changed, 27 insertions(+), 24 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
