The branch, eden-pre has been updated
via 4879c6f7e129401b1ea6c309b79a74b1eb7f6c67 (commit)
from 87b2657a6b057450584c1a7a68d21ad1ee560b60 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=4879c6f7e129401b1ea6c309b79a74b1eb7f6c67
commit 4879c6f7e129401b1ea6c309b79a74b1eb7f6c67
Author: ronie <[email protected]>
Date: Tue Sep 20 22:16:36 2011 +0200
[script.tv.show.next.aired] -v3.0.3
several fixes due to json-rpc changes and more...
diff --git a/script.tv.show.next.aired/addon.xml
b/script.tv.show.next.aired/addon.xml
index d6fd898..31e638a 100644
--- a/script.tv.show.next.aired/addon.xml
+++ b/script.tv.show.next.aired/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.tv.show.next.aired"
name="TV Show - Next Aired"
- version="3.0.2"
+ version="3.0.3"
provider-name="Ppic, Frost, ronie">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.tv.show.next.aired/changelog.txt
b/script.tv.show.next.aired/changelog.txt
index 5f1c79a..580801e 100644
--- a/script.tv.show.next.aired/changelog.txt
+++ b/script.tv.show.next.aired/changelog.txt
@@ -1,3 +1,9 @@
+v3.0.3
+- adjusted to latest json-rpc changes
+- fixed tv show title in info dialog
+- fixed closing the script
+- fixed json query when compactoutput was set to false
+
v3.0.2
- code cleanup
- use cached thumbnail
diff --git a/script.tv.show.next.aired/default.py
b/script.tv.show.next.aired/default.py
index 41f42bf..95ecbdd 100644
--- a/script.tv.show.next.aired/default.py
+++ b/script.tv.show.next.aired/default.py
@@ -187,7 +187,7 @@ class NextAired:
self.count = 0
self.current_show_data = []
self.canceled = self.get_list("canceled.db")
- if not self.listing(): close("error listing")
+ if not self.listing(): self.close("error listing")
self.total_show = len(self.TVlist)
log( "###canceled list: %s " % self.canceled )
@@ -260,19 +260,21 @@ class NextAired:
def listing(self):
# json statement for tv shows
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"fields": ["file", "thumbnail"], "sort":
{ "method": "label" } }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["file", "thumbnail"],
"sort": { "method": "label" } }, "id": 1}')
json_response = re.compile( "{(.*?)}", re.DOTALL ).findall(json_query)
log( json_response )
self.TVlist = []
for tvshowitem in json_response:
log( tvshowitem )
- findtvshowname = re.search( '"label":"(.*?)","', tvshowitem )
+ findtvshowname = re.search( '"label": ?"(.*?)",["\n]', tvshowitem )
if findtvshowname:
tvshowname = ( findtvshowname.group(1) )
- findpath = re.search( '"file":"(.*?)","', tvshowitem )
+ findpath = re.search( '"file": ?"(.*?)",["\n]', tvshowitem )
if findpath:
path = (findpath.group(1))
- findthumbnail = re.search( '"thumbnail":"(.*?)","', tvshowitem
)
+ else:
+ path = ''
+ findthumbnail = re.search( '"thumbnail": ?"(.*?)",["\n]',
tvshowitem )
if findthumbnail:
thumbnail = (findthumbnail.group(1))
else:
diff --git
a/script.tv.show.next.aired/resources/skins/DefaultSkin/720p/DialogNextAired.xml
b/script.tv.show.next.aired/resources/skins/DefaultSkin/720p/DialogNextAired.xml
index 9f3fa2a..dce5b49 100644
---
a/script.tv.show.next.aired/resources/skins/DefaultSkin/720p/DialogNextAired.xml
+++
b/script.tv.show.next.aired/resources/skins/DefaultSkin/720p/DialogNextAired.xml
@@ -164,7 +164,7 @@
<content>
<item>
<label>$LOCALIZE[20364]:</label>
-
<label2>ListItem.Property(Show Name)]</label2>
+
<label2>$INFO[ListItem.Property(Show Name)]</label2>
<onclick>-</onclick>
<visible>!IsEmpty(ListItem.Property(Show Name))</visible>
</item>
-----------------------------------------------------------------------
Summary of changes:
script.tv.show.next.aired/addon.xml | 2 +-
script.tv.show.next.aired/changelog.txt | 6 ++++++
script.tv.show.next.aired/default.py | 12 +++++++-----
.../language/Portuguese (Brazil)/strings.xml | 14 ++++++++++++++
.../skins/DefaultSkin/720p/DialogNextAired.xml | 2 +-
5 files changed, 29 insertions(+), 7 deletions(-)
create mode 100644 script.tv.show.next.aired/resources/language/Portuguese
(Brazil)/strings.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
