The branch, eden-pre has been updated
via 0a4ddc563fe19c854462587b64250b932027e1b2 (commit)
from 4879c6f7e129401b1ea6c309b79a74b1eb7f6c67 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=0a4ddc563fe19c854462587b64250b932027e1b2
commit 0a4ddc563fe19c854462587b64250b932027e1b2
Author: ronie <[email protected]>
Date: Tue Sep 20 22:20:28 2011 +0200
[script.tvtunes] -v1.0.8
several fixes due to json-rpc changes and more...
diff --git a/script.tvtunes/addon.xml b/script.tvtunes/addon.xml
index 17a4c12..7be9887 100644
--- a/script.tvtunes/addon.xml
+++ b/script.tvtunes/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.tvtunes"
name="TvTunes"
- version="1.0.6"
+ version="1.0.8"
provider-name="Ppic, ronie">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.tvtunes/changelog.txt b/script.tvtunes/changelog.txt
index 3a69500..f718a31 100644
--- a/script.tvtunes/changelog.txt
+++ b/script.tvtunes/changelog.txt
@@ -1,3 +1,10 @@
+v1.0.8:
+- adjusted to latest json-rpc changes
+
+v1.0.7:
+- add support for rar files
+- fixed json query when compactoutput was set to false
+
v1.0.6:
- do not use the xbmc temp dir
diff --git a/script.tvtunes/resources/tvtunes_backend.py
b/script.tvtunes/resources/tvtunes_backend.py
index adb5fbf..8be87d1 100644
--- a/script.tvtunes/resources/tvtunes_backend.py
+++ b/script.tvtunes/resources/tvtunes_backend.py
@@ -102,6 +102,10 @@ class mythread( threading.Thread ):
self.newpath = self.newpath.replace("smb://", "smb://%s:%s@" %
(params.get("user", "guest" ) , params.get("password", "guest" )) )
log( "### %s" % self.newpath )
+ #######hack for episodes stored as rar files
+ if 'rar://' in str(self.newpath):
+ self.newpath = self.newpath.replace("rar://","")
+
#######hack for TV shows stored as ripped disc folders
if 'VIDEO_TS' in str(self.newpath):
log( "### FOUND VIDEO_TS IN PATH: Correcting the path for DVDR tv
shows" )
diff --git a/script.tvtunes/resources/tvtunes_scraper.py
b/script.tvtunes/resources/tvtunes_scraper.py
index 16fa3e9..50c3724 100644
--- a/script.tvtunes/resources/tvtunes_scraper.py
+++ b/script.tvtunes/resources/tvtunes_scraper.py
@@ -182,17 +182,17 @@ class TvTunes:
def listing(self):
# on recup la liste des series en biblio
# json statement for tv shows
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"fields": ["file"], "sort": { "method":
"label" } }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["file"], "sort": {
"method": "label" } }, "id": 1}')
json_response = re.compile( "{(.*?)}", re.DOTALL ).findall(json_query)
log( json_response )
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) )
tvshow = unicodedata.normalize('NFKD',
unicode(unicode(tvshowname, 'utf-8'))).encode('ascii','ignore')
- findpath = re.search( '"file":"(.*?)","', tvshowitem )
+ findpath = re.search( '"file": ?"(.*?)",["\n]', tvshowitem )
if findpath:
path = (findpath.group(1))
TVlist.append( ( tvshow , path ) )
-----------------------------------------------------------------------
Summary of changes:
script.tvtunes/addon.xml | 2 +-
script.tvtunes/changelog.txt | 7 +++++++
script.tvtunes/resources/tvtunes_backend.py | 4 ++++
script.tvtunes/resources/tvtunes_scraper.py | 6 +++---
4 files changed, 15 insertions(+), 4 deletions(-)
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
