The branch, eden-pre has been updated
       via  f3dd28502a9964bdb7248a448e474f0d6d68ef5b (commit)
      from  465493e187f94c7545ea033fd27e524fca12583b (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=f3dd28502a9964bdb7248a448e474f0d6d68ef5b

commit f3dd28502a9964bdb7248a448e474f0d6d68ef5b
Author: ronie <[email protected]>
Date:   Sat Jan 7 17:43:31 2012 +0100

    [script.tv.show.next.aired] -v4.1.14
    
    fixed index error while shifting airdays

diff --git a/script.tv.show.next.aired/addon.xml 
b/script.tv.show.next.aired/addon.xml
index fa15a95..a82f998 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.12"
+       version="4.1.14"
        provider-name="Ppic, Frost, ronie, `Black">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
@@ -13,8 +13,10 @@
   </extension>
   <extension point="xbmc.addon.metadata">
     <platform>all</platform>
+    <summary lang="de">Erhalten Sie Infos über die nächsten 
Ausstrahlungstermine Ihrer Serien.</summary>
     <summary lang="en">Get info for TV Shows Next Aired.</summary>
     <summary lang="fr">Récupère les dates de diffusions de vos 
séries</summary>
+    <description lang="de">TV Show Next Aired liefert Termin-Informationen 
über die anstehenden Episoden der Serien aus der Datenbank. Dazu gibt es eine 
Wochenansicht mit allen in der nächsten Woche laufenden Episoden sowie (bei 
vorhandenem Skin Support) die direkte Integration der Informationen in die 
Ansichten des jeweiligen Skins. Sie werden nie wieder eine Folge 
verpassen.</description>
     <description lang="en">Get info for TV Shows Next Aired. You'll never miss 
one again.</description>
     <description lang="fr">Ce script interroge votre médiathèque puis vas 
récupérer les infos sur les prochaines diffusions de vos séries. vous n'en 
manquerez plus aucune.</description>
   </extension>
diff --git a/script.tv.show.next.aired/changelog.txt 
b/script.tv.show.next.aired/changelog.txt
index 146b8ec..02df2cd 100644
--- a/script.tv.show.next.aired/changelog.txt
+++ b/script.tv.show.next.aired/changelog.txt
@@ -1,3 +1,11 @@
+v4.1.14
+- fixed index error while shifting airdays
+- added german summary & description
+- don't append Airtime when none was provided
+
+v4.1.13
+- ignore possible encoding errors
+
 v4.1.12
 - use artwork downloader instead of logo downloader
 
diff --git a/script.tv.show.next.aired/default.py 
b/script.tv.show.next.aired/default.py
index 410200e..2ba1d5f 100644
--- a/script.tv.show.next.aired/default.py
+++ b/script.tv.show.next.aired/default.py
@@ -182,6 +182,7 @@ class NextAired:
 
     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 = unicode(json_query, 'utf-8', errors='ignore')
         json_response = simplejson.loads(json_query)
         log("### %s" % json_response)
         self.TVlist = []
@@ -241,6 +242,10 @@ class NextAired:
             log( '### nextdate with local time zone %s' % 
datelocal.isoformat() )
             current_show["RFC3339"] = datelocal.isoformat()
             weekdaydiff = datelocal.weekday() - date.weekday()
+            if weekdaydiff == -1:
+                weekdaydiff = 6
+            elif weekdaydiff == -6:
+                weekdaydiff = 1
             try:
                 airday = current_show.get("Airtime").split(" at ")[0]
             except:
@@ -253,13 +258,14 @@ class NextAired:
                     log( "### error splitting airtime" )
                 for count, day in enumerate (airdays):
                     if day in self.days:
-                        index = self.days.index(day)
-                        airdays[count] = self.days[index + weekdaydiff]
+                        newindex = (self.days.index(day) + weekdaydiff) % 7
+                        airdays[count] = self.days[newindex]
                 airday = ', '.join(airdays)
-            if self.ampm:
-                current_show["Airtime"] = airday + " at " + 
datelocal.strftime('%I:%M %p')
-            else:
-                current_show["Airtime"] = airday + " at " + 
datelocal.strftime('%H:%M')
+            if airday != "":
+                if self.ampm:
+                    current_show["Airtime"] = airday + " at " + 
datelocal.strftime('%I:%M %p')
+                else:
+                    current_show["Airtime"] = airday + " at " + 
datelocal.strftime('%H:%M')
             try:
                 next = current_show.get("Next Episode").split("^")
                 next.extend(['',''])

-----------------------------------------------------------------------

Summary of changes:
 script.tv.show.next.aired/addon.xml     |    4 +++-
 script.tv.show.next.aired/changelog.txt |    8 ++++++++
 script.tv.show.next.aired/default.py    |   18 ++++++++++++------
 3 files changed, 23 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to