[Xbmc-addons] Plugins branch, eden, updated. ae8d63e9edb823632299a4819f30bb5219a6349e

[Martijn Kaijser]

The branch, eden has been updated
       via  ae8d63e9edb823632299a4819f30bb5219a6349e (commit)
      from  29e9c329200d4f602275dda5722196586519346d (commit)

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

commit ae8d63e9edb823632299a4819f30bb5219a6349e
Author: Martijn Kaijser <mcm.kaij...@gmail.com>
Date:   Sun Nov 18 11:40:18 2012 +0100

    [plugin.video.sagetv] 1.4.0

diff --git a/plugin.video.sagetv/addon.xml b/plugin.video.sagetv/addon.xml
index bf76d35..27c29c7 100644
--- a/plugin.video.sagetv/addon.xml
+++ b/plugin.video.sagetv/addon.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <addon id="plugin.video.sagetv"

        name="SageTV"

-       version="1.3.8"

+       version="1.4.0"

        provider-name="kricker,lehighbri,aaronb">

   <requires>

     <import addon="xbmc.python" version="2.0"/>

-    <import addon='script.module.parsedom' version='1.1.0'/>

   </requires>

   <extension point="xbmc.python.pluginsource"

             library="default.py">

@@ -22,15 +21,15 @@
     <summary lang="pt_BR">SageTV:  Procurar e administrar transmissões e 
gravações</summary>

     <summary lang="sk">SageTV: prehliadajte a spravujte vysielania a 
nahrávky</summary>

     <summary lang="sv">SageTV: Bläddra och administrera sändningar och 
inspelningar</summary>

-    <description lang="ar">يسمح لك الاتصال بمخدم ستيج 
تي في الخاص بك حيث تستطيع استعراض و عرض 
التسجيلات, عرض و إدارة تسجيلاتك القادمة, 
استعراض قوائم المحطات, و البحث عن البث 
المباشر و التسجيلات&#10;&#10;التبعات:&#10;مع ستيج 
تي في:&#10;Jetty Web Server 2.3.0.14  أو أحدث&#10; Sagex-api vs 
7.1.9.10 أو أحدث&#10; Batch Metadata Tools 4.10.1&#10;xbmc.js 
(نسخxbmc.js من"plugin.video.sagetv\extras\sagex\services" إلى 
الخاص بك "SageTV\SageTV\sagex\services" )&#10;</description>

-    <description lang="bg">Позволява Ви да се свържете 
със SageTV сървър, от който можете да 
преглеждате и възпроизвеждате записани 
предавания, да настройвате автоматично 
записване на предавания, преглеждате 
списъка с канали и търсите излъчвани 
предавания/записи.&#10;&#10;Изисквания:&#10;SageTV 
с:&#10;    Jetty Web Server 2.3.0.14 или по-нов&#10;    Sagex-api vs 
7.1.9.10 или по-нов&#10;    Batch Metadata Tools 4.10.1&#10;    xbmc.js 
(Копирайте xbmc.js от "plugin.video.sagetv\extras\sagex\services" 
във вашата "SageTV\SageTV\sagex\services" 
директория)&#10;</description>

-    <description lang="de">Erlaubt es Dir, dich zu einem SageTV-Server zu 
verbinden, aus dem du Aufnahmen durchsuchen und ansehen, kommende Aufnahmen 
verwalten und sehen, Kanallisten ansehen und nach Sendeterminen und Aufnahmen 
suchen kannst.&#10;&#10;Anforderungen:&#10;SageTV mit:&#10;Jetty Web Server 
2.3.0.14 oder neuer&#10;Sagex-api vs 7.1.9.10 oder neuer&#10; Batch Metadata 
Tools 4.10.1&#10; xbmc.js (Kopiere xbmc.js aus 
"plugin.video.sagetv\extras\sagex\services" in den 
"SageTV\SageTV\sagex\services" Ordner)&#10;&#10;</description>

-    <description lang="en">Allows you to connect to your SageTV server where 
you can browse and view recordings, view and manage your upcoming recordings, 
browse channel listings, and search for airings and 
recordings.&#10;&#10;Dependencies:&#10;SageTV with:&#10;    Jetty Web Server 
2.3.0.14 or newer&#10;    Sagex-api vs 7.1.9.10 or newer&#10;    Batch Metadata 
Tools 4.10.1&#10;    xbmc.js (Copy xbmc.js from 
"plugin.video.sagetv\extras\sagex\services" to your 
"SageTV\SageTV\sagex\services" directory)&#10;&#10;</description>

-    <description lang="es">Permitir conexiones con el servidor SageTV, donde 
puedes examinar y ver grabaciones,  ver y administrar tus próximas 
grabaciones, examinar la lista de canales, y buscar transmisiones y 
grabaciones&#10;&#10;Dependencias:&#10;SageTV con:&#10;Servidor Web Jetty 
2.3.0.14 o superior&#10;Sagex-api ver. 7.1.9.10 o superior&#10;Lote de Metadata 
Tools 4.10.1&#10;xbmc.js (Copiar xbmc.js desde 
"plugin.video.sagetv\extras\sagex\services" a tu directorio 
"SageTV\SageTV\sagex\services"&#10;&#10;</description>

-    <description lang="lt">Leidžia jums prisijungti prie jūsų SageTV 
serverio, kur jūs galite naršyti ir peržiūrėti įrašus, peržiūrėti ir 
valdyti savo būsimą(-us) įrašus, naršyti kanalų sąrašus. Airings 
įrašų paieška.&#10;Priklausomybės:&#10;SageTV with:&#10;Jetty Web Server 
2.3.0.14 or newer&#10;Sagex-api vs 7.1.9.10 or newer&#10;Batch Metadata Tools 
4.10.1&#10;xbmc.js (Copy xbmc.js from 
"plugin.video.sagetv\extras\sagex\services" to your 
"SageTV\SageTV\sagex\services" directory)&#10;</description>

-    <description lang="pt_BR">Permite que você se conectar ao servidor SageTV 
onde você pode navegar e ver gravações, visualizar e gerenciar suas 
gravações futuras, procure listagem de canais e busca de transmissões e 
gravações&#10;Dependências:&#10;SageTV com:&#10;    Jetty Web Server 
2.3.0.14 ou mais recente&#10;    Sagex-api vs 7.1.9.10 ou mais recente&#10;    
Batch Metadata Tools 4.10.1&#10;    xbmc.js (Copy xbmc.js from 
"plugin.video.sagetv\extras\sagex\services" to your 
"SageTV\SageTV\sagex\services" directory)&#10;&#10;</description>

-    <description lang="sk">Umožní Vám pripojenie na Váš SageTV server, 
kde môžete prehliadať a pozerať nahrávky, pozerať a spravovať 
pripravované nahrávania, prehliadať zoznam kanálov a vyhľadávať 
vysielania a nahrávky.&#10;&#10;Závislosti SageTV:&#10;    Jetty Web Server 
2.3.0.14 alebo novší&#10;    Sagex-api vs 7.1.9.10 alebo novší&#10;    
Batch Metadata Tools 4.10.1&#10;    xbmc.js (Zkopírujte xbmc.js z 
"plugin.video.sagetv\extras\sagex\services" do Vášho 
"SageTV\SageTV\sagex\services" priečinku)&#10;&#10;</description>

-    <description lang="sv">Gör det möjligt att ansluta till din SageTV 
server där du kan bläddra och se inspelningar, se och administrera kommande 
inspelningar, bläddra kanallistningar, och söka efter sändningar och 
inspelningar.&#10;&#10;Krav på ytterligare tillägg:&#10;SageTV med:&#10;    
Jetty Web Server 2.3.0.14 eller nyare&#10;    Sagex-api vs 7.1.9.10 eller 
nyare&#10;    Batch Metadata Tools 4.10.1&#10;    xbmc.js (Kopiera xbmc.js 
från "plugin.video.sagetv\extras\sagex\services" till 
"SageTV\SageTV\sagex\services" katalogen)&#10;&#10;</description>

+    <description lang="ar">يسمح لك الاتصال بمخدم ستيج 
تي في الخاص بك حيث تستطيع استعراض و عرض 
التسجيلات, عرض و إدارة تسجيلاتك القادمة, 
استعراض قوائم المحطات, و البحث عن البث 
المباشر و التسجيلات&#10;&#10;التبعات:&#10;مع ستيج 
تي في:&#10;Jetty Web Server 2.3.0.14  أو أحدث&#10; Sagex-api vs 
7.1.9.12 أو أحدث&#10; Batch Metadata Tools 4.10.1&#10;xbmc.js 
(نسخxbmc.js من"plugin.video.sagetv\extras\sagex\services" إلى 
الخاص بك "SageTV\SageTV\sagex\services" )&#10;</description>

+    <description lang="bg">Позволява Ви да се свържете 
със SageTV сървър, от който можете да 
преглеждате и възпроизвеждате записани 
предавания, да настройвате автоматично 
записване на предавания, преглеждате 
списъка с канали и търсите излъчвани 
предавания/записи.&#10;&#10;Изисквания:&#10;SageTV 
с:&#10;    Jetty Web Server 2.3.0.14 или по-нов&#10;    Sagex-api vs 
7.1.9.12 или по-нов&#10;    Batch Metadata Tools 4.10.1&#10;    xbmc.js 
(Копирайте xbmc.js от "plugin.video.sagetv\extras\sagex\services" 
във вашата "SageTV\SageTV\sagex\services" 
директория)&#10;</description>

+    <description lang="de">Erlaubt es Dir, dich zu einem SageTV-Server zu 
verbinden, aus dem du Aufnahmen durchsuchen und ansehen, kommende Aufnahmen 
verwalten und sehen, Kanallisten ansehen und nach Sendeterminen und Aufnahmen 
suchen kannst.&#10;&#10;Anforderungen:&#10;SageTV mit:&#10;Jetty Web Server 
2.3.0.14 oder neuer&#10;Sagex-api vs 7.1.9.12 oder neuer&#10; Batch Metadata 
Tools 4.10.1&#10; xbmc.js (Kopiere xbmc.js aus 
"plugin.video.sagetv\extras\sagex\services" in den 
"SageTV\SageTV\sagex\services" Ordner)&#10;&#10;</description>

+    <description lang="en">Allows you to connect to your SageTV server where 
you can browse and view recordings, view and manage your upcoming recordings, 
browse channel listings, and search for airings and 
recordings.&#10;&#10;Dependencies:&#10;SageTV with:&#10;    Jetty Web Server 
2.3.0.14 or newer&#10;    Sagex-api vs 7.1.9.12 or newer&#10;    Batch Metadata 
Tools 4.10.1&#10;    xbmc.js (Copy xbmc.js from 
"plugin.video.sagetv\extras\sagex\services" to your 
"SageTV\SageTV\sagex\services" directory)&#10;&#10;</description>

+    <description lang="es">Permitir conexiones con el servidor SageTV, donde 
puedes examinar y ver grabaciones,  ver y administrar tus próximas 
grabaciones, examinar la lista de canales, y buscar transmisiones y 
grabaciones&#10;&#10;Dependencias:&#10;SageTV con:&#10;Servidor Web Jetty 
2.3.0.14 o superior&#10;Sagex-api ver. 7.1.9.12 o superior&#10;Lote de Metadata 
Tools 4.10.1&#10;xbmc.js (Copiar xbmc.js desde 
"plugin.video.sagetv\extras\sagex\services" a tu directorio 
"SageTV\SageTV\sagex\services"&#10;&#10;</description>

+    <description lang="lt">Leidžia jums prisijungti prie jūsų SageTV 
serverio, kur jūs galite naršyti ir peržiūrėti įrašus, peržiūrėti ir 
valdyti savo būsimą(-us) įrašus, naršyti kanalų sąrašus. Airings 
įrašų paieška.&#10;Priklausomybės:&#10;SageTV with:&#10;Jetty Web Server 
2.3.0.14 or newer&#10;Sagex-api vs 7.1.9.12 or newer&#10;Batch Metadata Tools 
4.10.1&#10;xbmc.js (Copy xbmc.js from 
"plugin.video.sagetv\extras\sagex\services" to your 
"SageTV\SageTV\sagex\services" directory)&#10;</description>

+    <description lang="pt_BR">Permite que você se conectar ao servidor SageTV 
onde você pode navegar e ver gravações, visualizar e gerenciar suas 
gravações futuras, procure listagem de canais e busca de transmissões e 
gravações&#10;Dependências:&#10;SageTV com:&#10;    Jetty Web Server 
2.3.0.14 ou mais recente&#10;    Sagex-api vs 7.1.9.12 ou mais recente&#10;    
Batch Metadata Tools 4.10.1&#10;    xbmc.js (Copy xbmc.js from 
"plugin.video.sagetv\extras\sagex\services" to your 
"SageTV\SageTV\sagex\services" directory)&#10;&#10;</description>

+    <description lang="sk">Umožní Vám pripojenie na Váš SageTV server, 
kde môžete prehliadať a pozerať nahrávky, pozerať a spravovať 
pripravované nahrávania, prehliadať zoznam kanálov a vyhľadávať 
vysielania a nahrávky.&#10;&#10;Závislosti SageTV:&#10;    Jetty Web Server 
2.3.0.14 alebo novší&#10;    Sagex-api vs 7.1.9.12 alebo novší&#10;    
Batch Metadata Tools 4.10.1&#10;    xbmc.js (Zkopírujte xbmc.js z 
"plugin.video.sagetv\extras\sagex\services" do Vášho 
"SageTV\SageTV\sagex\services" priečinku)&#10;&#10;</description>

+    <description lang="sv">Gör det möjligt att ansluta till din SageTV 
server där du kan bläddra och se inspelningar, se och administrera kommande 
inspelningar, bläddra kanallistningar, och söka efter sändningar och 
inspelningar.&#10;&#10;Krav på ytterligare tillägg:&#10;SageTV med:&#10;    
Jetty Web Server 2.3.0.14 eller nyare&#10;    Sagex-api vs 7.1.9.12 eller 
nyare&#10;    Batch Metadata Tools 4.10.1&#10;    xbmc.js (Kopiera xbmc.js 
från "plugin.video.sagetv\extras\sagex\services" till 
"SageTV\SageTV\sagex\services" katalogen)&#10;&#10;</description>

     <platform>all</platform>

   </extension>

 </addon>
\ No newline at end of file
diff --git a/plugin.video.sagetv/changelog.txt 
b/plugin.video.sagetv/changelog.txt
index 84b787c..0c44fab 100644
--- a/plugin.video.sagetv/changelog.txt
+++ b/plugin.video.sagetv/changelog.txt
@@ -1,3 +1,7 @@
+[B]Version 1.4.0 (Nov 13, 2012)[/B]

+- Removed dependency on CommonFunctions (script.module.parsedom) which was 
previously used to ask what text to search for using the search for 
recordings/airings

+- Enhanced xbmc.js to include a version number to ensure that the latest 
xbmc.js file is being used as the addon versions up over time

+

 [B]Version 1.3.8 (Nov 8, 2012)[/B]

 - Added additional error checking upon launch of the addon to ensure the 
correct sagex plugins are installed (and if they aren't it will kick you back 
to the main menu after informing you of the issue)

 - Added in initial language translations for German, Slovak, Spanish, Swedish, 
Lithuanian, and Portuguese (Brazil)

diff --git a/plugin.video.sagetv/default.py b/plugin.video.sagetv/default.py
index 7de92c4..6282639 100644
--- a/plugin.video.sagetv/default.py
+++ b/plugin.video.sagetv/default.py
@@ -1,5 +1,5 @@
 import urllib,urllib2,re,string

-import xbmc,xbmcplugin,xbmcgui,xbmcaddon,CommonFunctions

+import xbmc,xbmcplugin,xbmcgui,xbmcaddon

 import os

 import simplejson as json

 import unicodedata

@@ -8,8 +8,6 @@ from xml.dom.minidom import parse
 from time import strftime,sleep

 from datetime import date

 

-common = CommonFunctions

-

 __settings__ = xbmcaddon.Addon(id='plugin.video.sagetv')

 __language__ = __settings__.getLocalizedString

 __cwd__      = __settings__.getAddonInfo('path')

@@ -59,6 +57,7 @@ IMAGE_POSTER = 
xbmc.translatePath(os.path.join(__cwd__,'resources','media','post
 IMAGE_THUMB = 
xbmc.translatePath(os.path.join(__cwd__,'resources','media','thumb.jpg'))

 DEFAULT_CHARSET = 'utf-8'

 MIN_VERSION_SAGEX_REQUIRED = "7.1.9.12"

+VERSION_XBMCJS_REQUIRED = "1.0.0"

 

 # 500-THUMBNAIL 501/502/505/506/507/508-LIST 503-MINFO2 504-MINFO 515-MINFO3

 confluence_views = [500,501,502,503,504,508]

@@ -67,6 +66,14 @@ confluence_views = [500,501,502,503,504,508]
 def TOPLEVELCATEGORIES():

 

     #url = strUrl + '/sagex/api?command=GetInstalledPluginss&encoder=json'

+    url = strUrl + '/sagex/api?c=xbmc:GetXBMCJSVersionNumber&encoder=json'

+    xbmcjsVersion = executeSagexAPIJSONCall(url, "Result")

+    if(xbmcjsVersion != VERSION_XBMCJS_REQUIRED):

+        print "***xbmc.js version found=" + xbmcjsVersion + "; user must make 
sure they have the latest xbmc.js installed on their SageTV server 
(VERSION_XBMCJS_REQUIRED=" + VERSION_XBMCJS_REQUIRED + ")"

+        
xbmcgui.Dialog().ok(__language__(21004),__language__(21045),__language__(21046),__language__(21047))

+        xbmc.executebuiltin('ActivateWindow(Home)')

+        return

+    

     url = strUrl + 
'/sagex/api?c=xbmc:GetPluginVersion&1=sagex-api-services&encoder=json'

     sagexVersion = executeSagexAPIJSONCall(url, "Result")

 

@@ -78,11 +85,6 @@ def TOPLEVELCATEGORIES():
             xbmcgui.Dialog().ok(__language__(21004),__language__(21005) + " " 
+ MIN_VERSION_SAGEX_REQUIRED, __language__(21006),__language__(21007))

             xbmc.executebuiltin('ActivateWindow(Home)')

             return

-        elif(sagexVersion.find("java.lang.NoSuchMethodException: no such 
method: GetPluginVersion") != -1 or sagexVersion.find("Missing Service File") 
!= -1):

-            print "GetPluginVersion method not found in the xbmc.js file; user 
must make sure they have the latest xbmc.js installed on their SageTV server"

-            
xbmcgui.Dialog().ok(__language__(21004),__language__(21045),__language__(21046),__language__(21047))

-            xbmc.executebuiltin('ActivateWindow(Home)')

-            return

         else:

             print "SageTV not detected, or required plugins not installed"

             
xbmcgui.Dialog().ok(__language__(21000),__language__(21001),__language__(21002),__language__(21003))

@@ -91,7 +93,7 @@ def TOPLEVELCATEGORIES():
         

     print "Successfully able to connect to the SageTV server @ " + 
__settings__.getSetting("sage_ip") + ':' + __settings__.getSetting("sage_port")

  

-    print "TOPLEVELCATEGORIES STARTED; sagex-api-services version=" + 
sagexVersion

+    print "TOPLEVELCATEGORIES STARTED; xbmc.js file version=" + xbmcjsVersion 
+ ";sagex-api-services version=" + sagexVersion

     if(sagexVersion == ""):

         xbmcgui.Dialog().ok(__language__(21004),__language__(21005) + " " + 
MIN_VERSION_SAGEX_REQUIRED, __language__(21006),__language__(21007))

         xbmc.executebuiltin('ActivateWindow(Home)')

@@ -333,7 +335,10 @@ def VIEWAIRINGSONCHANNEL(url,name):
     xbmc.executebuiltin("Container.SetViewMode(504)")

 

 def SEARCHFORRECORDINGS(url,name):

-    titleToSearchFor = common.getUserInput(__language__(21010),"")

+    keyboard = xbmc.Keyboard('', __language__(21010))

+    keyboard.doModal()

+    if (keyboard.isConfirmed()):

+        titleToSearchFor = keyboard.getText()

     if(titleToSearchFor == "" or titleToSearchFor == None):

         return

     url = strUrl + 
'/sagex/api?c=xbmc:SearchForMediaFiles&1=%s&size=100&encoder=json' % 
urllib2.quote(titleToSearchFor.encode("utf8"))

@@ -410,9 +415,13 @@ def SEARCHFORRECORDINGS(url,name):
     xbmc.executebuiltin("Container.SetViewMode(504)")

 

 def SEARCHFORAIRINGS(url,name):

-    titleToSearchFor = common.getUserInput(__language__(21010),"")

+    keyboard = xbmc.Keyboard('', __language__(21010))

+    keyboard.doModal()

+    if (keyboard.isConfirmed()):

+        titleToSearchFor = keyboard.getText()

     if(titleToSearchFor == "" or titleToSearchFor == None):

         return

+

     now = time.time()

     startRange = str(long(now * 1000))

     #url = strUrl + 
'/sagex/api?command=EvaluateExpression&1=FilterByRange(SearchByTitle("%s","T"),"GetAiringStartTime","%s",java_lang_Long_MAX_VALUE,true)&encoder=json'
 % (urllib2.quote(titleToSearchFor.encode("utf8")), startRange)


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

Summary of changes:
 plugin.video.sagetv/addon.xml     |   21 ++++++++++-----------
 plugin.video.sagetv/changelog.txt |    4 ++++
 plugin.video.sagetv/default.py    |   31 ++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Plugins


------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons