The branch, eden has been updated
via ce97676dfe600eb01de68459cbcdb14ebb1c4c80 (commit)
via 79f27f2b4475d609e1f37d04e95776c91beb10ce (commit)
from 8c5478a71ee6ce04bbd4d7dc280fdd0887ba4d82 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=ce97676dfe600eb01de68459cbcdb14ebb1c4c80
commit ce97676dfe600eb01de68459cbcdb14ebb1c4c80
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 8 19:22:34 2012 +0200
[script.watchlist] -v0.1.17
diff --git a/script.watchlist/addon.xml b/script.watchlist/addon.xml
index 98009ec..6463c11 100644
--- a/script.watchlist/addon.xml
+++ b/script.watchlist/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.watchlist" name="Watchlist" version="0.1.16"
provider-name="ronie, `Black, Martijn">
+<addon id="script.watchlist" name="Watchlist" version="0.1.17"
provider-name="ronie, `Black, Martijn">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.watchlist/changelog.txt b/script.watchlist/changelog.txt
index 0b4e328..fd54f1f 100644
--- a/script.watchlist/changelog.txt
+++ b/script.watchlist/changelog.txt
@@ -1,4 +1,4 @@
-v0.1.16
+v0.1.17
- fix error on empty JSON-RPC result
v0.1.15
diff --git a/script.watchlist/default.py b/script.watchlist/default.py
index 3853b4f..74a9b99 100644
--- a/script.watchlist/default.py
+++ b/script.watchlist/default.py
@@ -76,7 +76,7 @@ class Main:
json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovies", "params": {"properties": ["title", "resume", "genre",
"studio", "tagline", "runtime", "fanart", "thumbnail", "file", "plot",
"plotoutline", "year", "lastplayed", "rating"]}, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('movies'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('movies'):
for item in json_response['result']['movies']:
self.movieList.append(item)
if item['resume']['position'] > 0:
@@ -114,7 +114,7 @@ class Main:
json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetEpisodes", "params": {"properties": ["title", "playcount",
"plot", "season", "episode", "showtitle", "thumbnail", "file", "lastplayed",
"rating"], "sort": {"method": "episode"} }, "id": 1}' )
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('episodes'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('episodes'):
json_response = json_response['result']['episodes']
# our list is sorted by episode number, secondary we sort by
tvshow title (itertools.groupy needs contiguous items) and split it into
seperate lists for each tvshow
episodes = [list(group) for key,group in
itertools.groupby(sorted(json_response, key=itemgetter('showtitle')),
key=itemgetter('showtitle'))]
@@ -136,7 +136,7 @@ class Main:
json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetSeasons", "params": {"properties": ["season", "thumbnail"],
"tvshowid":%s }, "id": 1}' % tvshowid)
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('seasons'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('seasons'):
for item in json_response['result']['seasons']:
season = "%.2d" % float(item['season'])
if season == seasonnumber:
@@ -213,7 +213,7 @@ class Main:
json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetSongs", "params": {"properties": ["playcount", "albumid"],
"sort": { "method": "album" } }, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('songs'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('songs'):
for item in json_response['result']['songs']:
albumid = item['albumid']
if albumid != '':
@@ -242,7 +242,7 @@ class Main:
json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"AudioLibrary.GetAlbumDetails", "params": {"properties": ["title",
"description", "albumlabel", "artist", "genre", "year", "thumbnail", "fanart",
"rating"], "albumid":%s }, "id": 1}' % albumid[0])
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and
json_response.has_key['result'] != None and
json_response['result'].has_key('albumdetails'):
+ if json_response.has_key('result') and json_response['result'] !=
None and json_response['result'].has_key('albumdetails'):
item = json_response['result']['albumdetails']
description = item['description']
album = item['title']
@@ -269,7 +269,7 @@ class Main:
playlist = xbmc.PlayList(0)
# clear the playlist
playlist.clear()
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('songs'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('songs'):
for item in json_response['result']['songs']:
song = item['file']
fanart = item['fanart']
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=79f27f2b4475d609e1f37d04e95776c91beb10ce
commit 79f27f2b4475d609e1f37d04e95776c91beb10ce
Author: Martijn Kaijser <[email protected]>
Date: Wed Aug 8 19:22:16 2012 +0200
[script.randomitems] -v3.1.5
diff --git a/script.randomitems/RandomItems.py
b/script.randomitems/RandomItems.py
index 8c6b765..5ad6bce 100644
--- a/script.randomitems/RandomItems.py
+++ b/script.randomitems/RandomItems.py
@@ -88,7 +88,7 @@ class Main:
json_query = unicode(json_query, 'utf-8', errors='ignore')
# separate the records
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('movies'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('movies'):
json_response = json_response['result']['movies']
# get total value
total = str( len( json_response ) )
@@ -137,7 +137,7 @@ class Main:
json_query = unicode(json_query, 'utf-8', errors='ignore')
# separate the records
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and (son_response['result'].has_key('episodes'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('episodes'):
json_response = json_response['result']['episodes']
# get total value
total = str( len( json_response ) )
@@ -187,7 +187,7 @@ class Main:
json_query = unicode(json_query, 'utf-8', errors='ignore')
# separate the records
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('musicvideos'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('musicvideos'):
json_response = json_response['result']['musicvideos']
# get total value
total = str( len( json_response ) )
@@ -234,7 +234,7 @@ class Main:
# separate the records
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('albums'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('albums'):
json_response = json_response['result']['albums']
# get total value
total = str( len( json_response ) )
@@ -276,7 +276,7 @@ class Main:
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('artists'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('artists'):
json_response = json_response['result']['artists']
# get total value
total = str( len( json_response ) )
@@ -313,7 +313,7 @@ class Main:
json_query = unicode(json_query, 'utf-8', errors='ignore')
# separate the records
json_response = simplejson.loads(json_query)
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('songs'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('songs'):
json_response = json_response['result']['songs']
# get total value
total = str( len( json_response ) )
@@ -418,7 +418,7 @@ class Main:
# separate the records
json_response = simplejson.loads(json_query)
# enumerate thru our records
- if json_response.has_key('result') and json_response.has_key['result']
!= None and json_response['result'].has_key('songs'):
+ if json_response.has_key('result') and json_response['result'] != None
and json_response['result'].has_key('songs'):
for item in json_response['result']['songs']:
song = item['file']
fanart = item['fanart']
diff --git a/script.randomitems/addon.xml b/script.randomitems/addon.xml
index 2916be6..b5087c2 100644
--- a/script.randomitems/addon.xml
+++ b/script.randomitems/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.randomitems" name="Random Items script" version="3.1.4"
provider-name="Hitcher, ronie, phil65, Martijn">
+<addon id="script.randomitems" name="Random Items script" version="3.1.5"
provider-name="Hitcher, ronie, phil65, Martijn">
<requires>
<import addon="xbmc.python" version="2.0"/>
<import addon="script.module.elementtree" version="1.2.7"/>
diff --git a/script.randomitems/changelog.txt b/script.randomitems/changelog.txt
index ed01512..d864fa1 100644
--- a/script.randomitems/changelog.txt
+++ b/script.randomitems/changelog.txt
@@ -1,4 +1,4 @@
-v3.1.4
+v3.1.5
- fix error on empty JSON-RPC result
v3.1.3
-----------------------------------------------------------------------
Summary of changes:
script.randomitems/RandomItems.py | 14 +++++++-------
script.randomitems/addon.xml | 2 +-
script.randomitems/changelog.txt | 2 +-
script.watchlist/addon.xml | 2 +-
script.watchlist/changelog.txt | 2 +-
script.watchlist/default.py | 12 ++++++------
6 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
