The branch, eden has been updated
via eb5cecbb5f737634983e7e9c738705e3eb083aa8 (commit)
from 3668f75621fda24a291bd4f9522bd7beeeb2f75f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=eb5cecbb5f737634983e7e9c738705e3eb083aa8
commit eb5cecbb5f737634983e7e9c738705e3eb083aa8
Author: ronie <[email protected]>
Date: Tue Mar 20 18:05:23 2012 +0100
[script.tv.show.next.aired] -v4.1.20
use title instead of label
diff --git a/script.tv.show.next.aired/addon.xml
b/script.tv.show.next.aired/addon.xml
index d5e77ab..40312b3 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="4.1.15"
+ version="4.1.20"
provider-name="Ppic, Frost, ronie, `Black">
<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 5543784..64d7fa5 100644
--- a/script.tv.show.next.aired/changelog.txt
+++ b/script.tv.show.next.aired/changelog.txt
@@ -1,3 +1,19 @@
+v4.1.20
+- use title instead of label
+
+v4.1.19
+- fix unicode in path issue
+
+v4.1.18
+- revert previous airtime fixed and add check in next_aired_dialog.py instead
+
+v4.1.17
+- set empty airtime when we fail to parse it
+
+v4.1.16
+- fix for occasions where airtime contains no weekday
+- use json module on systems with python 2.7 or up
+
v4.1.15
- fix issue with single character day/month in dateshort
diff --git a/script.tv.show.next.aired/default.py
b/script.tv.show.next.aired/default.py
index 81ca2d1..a752f77 100644
--- a/script.tv.show.next.aired/default.py
+++ b/script.tv.show.next.aired/default.py
@@ -1,9 +1,13 @@
from time import strptime, time, mktime
-import os, sys, re, socket, urllib, unicodedata, simplejson
+import os, sys, re, socket, urllib, unicodedata
from traceback import print_exc
from datetime import datetime, date, timedelta, tzinfo
from dateutil import tz
import xbmc, xbmcgui, xbmcaddon, xbmcvfs
+if sys.version_info < (2, 7):
+ import simplejson
+else:
+ import json as simplejson
# http://mail.python.org/pipermail/python-list/2009-June/596197.html
import _strptime
@@ -18,7 +22,7 @@ __language__ = __addon__.getLocalizedString
__useragent__ = "Mozilla/5.0 (Windows; U; Windows NT 5.1; fr; rv:1.9.0.1)
Gecko/2008070208 Firefox/3.6"
DATA_PATH = os.path.join( xbmc.translatePath( "special://profile/addon_data/"
), __addonid__ )
-RESOURCES_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources' ) )
+RESOURCES_PATH = xbmc.translatePath( os.path.join( __cwd__, 'resources' )
).decode('utf-8')
sys.path.append( os.path.join( RESOURCES_PATH, "lib" ) )
# Get localized date format
@@ -186,14 +190,14 @@ class NextAired:
DIALOG_PROGRESS.close()
def listing(self):
- json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["file", "thumbnail",
"fanart"], "sort": { "method": "label" } }, "id": 1}')
+ json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method":
"VideoLibrary.GetTVShows", "params": {"properties": ["title", "file",
"thumbnail", "fanart"], "sort": { "method": "title" } }, "id": 1}')
json_query = unicode(json_query, 'utf-8', errors='ignore')
json_response = simplejson.loads(json_query)
log("### %s" % json_response)
self.TVlist = []
if json_response['result'].has_key('tvshows'):
for item in json_response['result']['tvshows']:
- tvshowname = item['label']
+ tvshowname = item['title']
tvshowname = normalize_string( tvshowname )
path = item['file']
thumbnail = item['thumbnail']
diff --git a/script.tv.show.next.aired/resources/lib/next_aired_dialog.py
b/script.tv.show.next.aired/resources/lib/next_aired_dialog.py
index 6e3df3b..80bc8ba 100644
--- a/script.tv.show.next.aired/resources/lib/next_aired_dialog.py
+++ b/script.tv.show.next.aired/resources/lib/next_aired_dialog.py
@@ -43,6 +43,8 @@ class Gui( xbmcgui.WindowXML ):
except:
continue
for day in airdays:
+ if (day[0] == '0') or (day[0] == '1'):
+ continue
listitem = self.setLabels('listitem', item, True)
nextdate = item.get("RFC3339" , "" )[:10]
if len(nextdate) == 10:
diff --git
a/script.tv.show.next.aired/resources/skins/Default/720p/script-NextAired-TVGuide.xml
b/script.tv.show.next.aired/resources/skins/Default/720p/script-NextAired-TVGuide.xml
index e5f7e9f..10b8b1b 100644
---
a/script.tv.show.next.aired/resources/skins/Default/720p/script-NextAired-TVGuide.xml
+++
b/script.tv.show.next.aired/resources/skins/Default/720p/script-NextAired-TVGuide.xml
@@ -2287,7 +2287,7 @@
<width>25</width>
<height>20</height>
<texturenofocus>TVGuide-HomeIcon.png</texturenofocus>
-
<texturefocus>TVGuide-HomeIcon-Focus</texturefocus>
+
<texturefocus>TVGuide-HomeIcon-Focus.png</texturefocus>
<label>-</label>
<onclick>ActivateWindow(Home)</onclick>
</control>
-----------------------------------------------------------------------
Summary of changes:
script.tv.show.next.aired/addon.xml | 2 +-
script.tv.show.next.aired/changelog.txt | 16 ++++++++++++++++
script.tv.show.next.aired/default.py | 12 ++++++++----
.../resources/lib/next_aired_dialog.py | 2 ++
.../Default/720p/script-NextAired-TVGuide.xml | 2 +-
5 files changed, 28 insertions(+), 6 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
