tux-droid-svn — Subversion commit reports.

[tuxdroid-svn] r5105 - software_suite_v3/smart-core/smart-server/trunk/util/system

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-13 15:59:47 +0200 (Mon, 13 Jul 2009)
New Revision: 5105

Modified:
   software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py
Log:
* Disabled function to refresh the taskbar icons (Crash on Vista)

Modified: software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py	2009-07-13 09:06:43 UTC (rev 5104)
+++ software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py	2009-07-13 13:59:47 UTC (rev 5105)
@@ -51,8 +51,11 @@
 def refreshTaskBar():
     """Refresh the task bar.
     """
+    return
+    '''
     if os.name == "nt":
         __refreshTaskBarWin32()
     else:
         __refreshTaskBarUnix()
+    '''
 

[tuxdroid-svn] r5104 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-13 11:06:43 +0200 (Mon, 13 Jul 2009)
New Revision: 5104

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Fixed a doubled tts sentence when skype is not installed.

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-10 10:54:20 UTC (rev 5103)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-13 09:06:43 UTC (rev 5104)
@@ -357,9 +357,11 @@
                 else:
                     self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
                     self.__activeMain = False
+                    self.stop()
             except WindowsError:
                 self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
                 self.__activeMain = False
+                self.stop()
 
     def __startSkypeAppLinux(self):
         """Start skype on linux ( thread needed to do not block the script ).

[tuxdroid-svn] r5103 - software_suite_v3/smart-core/smart-server/trunk

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-10 12:54:20 +0200 (Fri, 10 Jul 2009)
New Revision: 5103

Modified:
   software_suite_v3/smart-core/smart-server/trunk/installer.nsi
   software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Updated version from 0.4.1-b2 to 0.4.1-b3

Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi	2009-07-10 10:52:02 UTC (rev 5102)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi	2009-07-10 10:54:20 UTC (rev 5103)
@@ -4,7 +4,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b2"
+!define PRODUCT_VERSION "0.4.1-b3"
 
 ; Output names
 !define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"

Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py	2009-07-10 10:52:02 UTC (rev 5102)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py	2009-07-10 10:54:20 UTC (rev 5103)
@@ -7,7 +7,7 @@
 #    Distributed under the terms of the GNU General Public License
 #    http://www.gnu.org/copyleft/gpl.html
 
-version = '0.4.1-b2'
+version = '0.4.1-b3'
 author = "Remi Jocaille (rem...@c2...)"
 licence = "GPL"
 date = "2009"

[tuxdroid-svn] r5102 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-10 12:52:02 +0200 (Fri, 10 Jul 2009)
New Revision: 5102

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Refresh the task bar after skype killing

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-10 10:45:26 UTC (rev 5101)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-10 10:52:02 UTC (rev 5102)
@@ -23,6 +23,7 @@
 
 from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
 from util.SimplePlugin.SimplePlugin import SimplePlugin
+from util.system.TaskBar import refreshTaskBar
 
 class Configuration(SimplePluginConfiguration):
     """This class make an access to the plugin parameters.
@@ -127,6 +128,7 @@
                             pass
                     else:
                         os.system("kill -9 " + str(self.__skypeProcess.pid))
+                refreshTaskBar()
         try:
             if self.__skype != None:
                 self.hangUp()
@@ -365,11 +367,11 @@
         # Searching for skype binary.
         result = []
         found =False
-        
+
         result = os.environ
 
         result = result['PATH'].split(':')
-        
+
         for path in result:
            cmd = 'ls ' + path + ' | grep skype'
            res = commands.getoutput(cmd)

[tuxdroid-svn] r5101 - in software_suite_v3/smart-core/smart-server/trunk: . util util/misc util/smartcore util/system

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-10 12:45:26 +0200 (Fri, 10 Jul 2009)
New Revision: 5101

Added:
   software_suite_v3/smart-core/smart-server/trunk/util/smartcore/
   software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py
   software_suite_v3/smart-core/smart-server/trunk/util/smartcore/__init__.py
   software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py
Modified:
   software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
   software_suite_v3/smart-core/smart-server/trunk/util/misc/URLTools.py
Log:
* Refresh task bar at server start/stop
* Improved server kill on Windows

Modified: software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py	2009-07-10 07:15:50 UTC (rev 5100)
+++ software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py	2009-07-10 10:45:26 UTC (rev 5101)
@@ -16,86 +16,33 @@
 import os
 import getopt
 
+from util.smartcore.OldProcessKiller import killOldSmartCoreChildren
+from util.smartcore.OldProcessKiller import killPreviousSmartServer
+from util.system.TaskBar import refreshTaskBar
+from util.misc.URLTools import URLTestRequestGet
 from TDSConfiguration import *
 
-def killOldChildrenWin32():
-    import win32api
-    from win32com.client import GetObject
-    WMI = GetObject('winmgmts:')
-    processes = WMI.InstancesOf('Win32_Process')
-    pidToKill = []
-    for process in processes:
-        name = process.Properties_('Name').Value
-        cmdLine = process.Properties_('CommandLine').Value
-        if name == "python.exe":
-            if cmdLine.find('executables') != -1:
-                pidToKill.append(process.Properties_('ProcessId').Value)
-                continue
-        if cmdLine != None:
-            if cmdLine.lower().find('workforplugins') != -1:
-                pidToKill.append(process.Properties_('ProcessId').Value)
-                continue
-            if (cmdLine.lower().find('smart-server') != -1) and \
-                (cmdLine.lower().find('util') != -1):
-                pidToKill.append(process.Properties_('ProcessId').Value)
-                continue
-    for pid in pidToKill:
-        try:
-            handle = win32api.OpenProcess(1, False, pid)
-            win32api.TerminateProcess(handle, -1)
-            win32api.CloseHandle(handle)
-        except:
-            pass
-
-def killOldChildrenUnix():
-    pass
-
 def checkServerRun():
-    import httplib
-    h = httplib.HTTP("127.0.0.1:%d" % TDS_HTTP_PORT)
-    try:
-        h.connect()
-        h.putrequest("GET", "/")
-        h.endheaders()
-        code, st, msg = h.getreply()
-        if code != 200:
-            return False
-        else:
-            return True
-    except:
-        return False
+    return URLTestRequestGet("127.0.0.1", TDS_HTTP_PORT, "/", 200, 5.0)
 
 def killServer():
-    if os.name == "nt":
-        killOldChildrenWin32()
-    else:
-        killOldChildrenUnix()
-    import httplib
-    h = httplib.HTTP("127.0.0.1:%d" % TDS_HTTP_PORT)
-    try:
-        h.connect()
-        h.putrequest("GET", "/server/stop?")
-        h.endheaders()
-        h.getreply()
-        h.putrequest("GET", "/server/stop?")
-        h.endheaders()
-        h.getreply()
-    except:
-        return
+    killOldSmartCoreChildren()
+    URLTestRequestGet("127.0.0.1", TDS_HTTP_PORT, "/server/stop?", 200, 0.5)
+    URLTestRequestGet("127.0.0.1", TDS_HTTP_PORT, "/server/stop?", 200, 0.5)
+    killPreviousSmartServer()
+    refreshTaskBar()
 
 def killServerAndWait():
     import time
     killServer()
-    time.sleep(1.0)
+    time.sleep(0.5)
     while checkServerRun():
-        time.sleep(1.0)
+        time.sleep(0.5)
 
 def runServer():
-    if os.name == "nt":
-        killOldChildrenWin32()
-    else:
-        killOldChildrenUnix()
-    import TuxDroidServer
+    killOldSmartCoreChildren()
+    killPreviousSmartServer()
+    refreshTaskBar()
     from TuxDroidServer import initializeServer
     from TuxDroidServer import httpServer
     from TuxDroidServer import finalizeServer

Modified: software_suite_v3/smart-core/smart-server/trunk/util/misc/URLTools.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/misc/URLTools.py	2009-07-10 07:15:50 UTC (rev 5100)
+++ software_suite_v3/smart-core/smart-server/trunk/util/misc/URLTools.py	2009-07-10 10:45:26 UTC (rev 5101)
@@ -14,6 +14,7 @@
 
 import socket
 import urllib2
+import httplib
 import os
 
 # ==============================================================================
@@ -123,6 +124,44 @@
     return result
 
 # ------------------------------------------------------------------------------
+# Send a request to a http server and check the result.
+# ------------------------------------------------------------------------------
+def URLTestRequestGet(host, port, request, expectedCode = 200, timeout = 5.0):
+    """Send a request to a http server and check the result.
+    @host: Server host.
+    @port: Server port.
+    @request: Request.
+    @expectedCode: Expected server code.
+    @timeout: Connection timeout.
+    @return: A boolean.
+    """
+    # Save the old default connection timeout
+    old_timeout = socket.getdefaulttimeout()
+    # Set the default connection timeout
+    socket.setdefaulttimeout(timeout)
+    # Create requester
+    h = httplib.HTTP("%s:%d" % (host, port))
+    # Initialize the result
+    result = False
+    try:
+        # Connect the host
+        h.connect()
+        # Configure request
+        h.putrequest("GET", request)
+        h.endheaders()
+        # Execute the request
+        code, st, msg = h.getreply()
+        # Check the resulting code
+        if code == expectedCode:
+            result = True
+    except:
+        pass
+    # Restore the old default connection timeout
+    socket.setdefaulttimeout(old_timeout)
+    # Return the result
+    return result
+
+# ------------------------------------------------------------------------------
 # Download a file from an URL.
 # ------------------------------------------------------------------------------
 def URLDownloadToFile(url, filePath, timeout = 5.0):

Added: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py	                        (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/smartcore/OldProcessKiller.py	2009-07-10 10:45:26 UTC (rev 5101)
@@ -0,0 +1,105 @@
+#    Copyright (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+import os
+
+# ------------------------------------------------------------------------------
+# Kill all process alive from a previous instance of smart-core. Window.
+# ------------------------------------------------------------------------------
+def __killOldSmartCoreChildrenWin32():
+    """Kill all process alive from a previous instance of smart-core. Window.
+    """
+    import win32api
+    from win32com.client import GetObject
+    WMI = GetObject('winmgmts:')
+    processes = WMI.InstancesOf('Win32_Process')
+    pidToKill = []
+    for process in processes:
+        name = process.Properties_('Name').Value
+        cmdLine = process.Properties_('CommandLine').Value
+        if name == "python.exe":
+            if cmdLine.find('executables') != -1:
+                pidToKill.append(process.Properties_('ProcessId').Value)
+                continue
+        if cmdLine != None:
+            if cmdLine.lower().find('workforplugins') != -1:
+                pidToKill.append(process.Properties_('ProcessId').Value)
+                continue
+            if (cmdLine.lower().find('smart-server') != -1) and \
+                (cmdLine.lower().find('util') != -1):
+                pidToKill.append(process.Properties_('ProcessId').Value)
+                continue
+    for pid in pidToKill:
+        try:
+            handle = win32api.OpenProcess(1, False, pid)
+            win32api.TerminateProcess(handle, -1)
+            win32api.CloseHandle(handle)
+        except:
+            pass
+            
+# ------------------------------------------------------------------------------
+# Kill previous smart-server. Window.
+# ------------------------------------------------------------------------------
+def __killPreviousSmartServerWin32():
+    """Kill previous smart-server. Window.
+    """
+    import win32api
+    from win32com.client import GetObject
+    WMI = GetObject('winmgmts:')
+    processes = WMI.InstancesOf('Win32_Process')
+    pidToKill = []
+    for process in processes:
+        name = process.Properties_('Name').Value
+        cmdLine = process.Properties_('CommandLine').Value
+        pid = process.Properties_('ProcessId').Value
+        if name.lower() == "pythonfortuxdroid.exe":
+            if cmdLine.find("tuxhttpserver") != -1:
+                if pid != os.getpid():
+                    pidToKill.append(pid)
+    for pid in pidToKill:
+        try:
+            handle = win32api.OpenProcess(1, False, pid)
+            win32api.TerminateProcess(handle, -1)
+            win32api.CloseHandle(handle)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Kill all process alive from a previous instance of smart-core. Unix.
+# ------------------------------------------------------------------------------
+def __killOldSmartCoreChildrenUnix():
+    """Kill all process alive from a previous instance of smart-core. Unix.
+    """
+    pass
+    
+# ------------------------------------------------------------------------------
+# Kill previous smart-server. Unix.
+# ------------------------------------------------------------------------------
+def __killPreviousSmartServerUnix():
+    """Kill previous smart-server. Unix.
+    """
+    pass
+
+# ------------------------------------------------------------------------------
+# Kill all process alive from a previous instance of smart-core.
+# ------------------------------------------------------------------------------
+def killOldSmartCoreChildren():
+    """Kill all process alive from a previous instance of smart-core.
+    """
+    if os.name == "nt":
+        __killOldSmartCoreChildrenWin32()
+    else:
+        __killOldSmartCoreChildrenUnix()
+        
+# ------------------------------------------------------------------------------
+# Kill previous smart-server.
+# ------------------------------------------------------------------------------
+def killPreviousSmartServer():
+    """Kill previous smart-server.
+    """
+    if os.name == "nt":
+        __killPreviousSmartServerWin32()
+    else:
+        __killPreviousSmartServerUnix()

Added: software_suite_v3/smart-core/smart-server/trunk/util/smartcore/__init__.py
===================================================================

Added: software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py	                        (rev 0)
+++ software_suite_v3/smart-core/smart-server/trunk/util/system/TaskBar.py	2009-07-10 10:45:26 UTC (rev 5101)
@@ -0,0 +1,58 @@
+#    Copyright (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+import os
+
+# ------------------------------------------------------------------------------
+# Refresh the task bar. Window.
+# ------------------------------------------------------------------------------
+def __refreshTaskBarWin32():
+    """Refresh the task bar. Window.
+    """
+    import win32api
+    import win32gui
+    import win32con
+    def FW(x, y):
+        return win32gui.FindWindowEx(x, 0, y, "")
+    # Get TaskBar handle
+    hWnd = win32gui.FindWindowEx(
+        FW(FW(FW(0, "Shell_TrayWnd"), "TrayNotifyWnd"), "SysPager"),
+        0,
+        "ToolbarWindow32",
+        "Notification Area")
+    # Get TaskBar area
+    rect = win32gui.GetClientRect(hWnd)
+    width = rect[2]
+    height = rect[3]
+    # Refresh TaskBar with a simulation of the mouse moving
+    for x in range(width / 4):
+        for y in range(height / 4):
+            xx = x * 4
+            yy = y * 4
+            win32api.SendMessage(
+                hWnd,
+                win32con.WM_MOUSEMOVE,
+                0,
+                yy * 65536 + xx)
+
+# ------------------------------------------------------------------------------
+# Refresh the task bar. Unix.
+# ------------------------------------------------------------------------------
+def __refreshTaskBarUnix():
+    """Refresh the task bar. Unix.
+    """
+    pass
+
+# ------------------------------------------------------------------------------
+# Refresh the task bar.
+# ------------------------------------------------------------------------------
+def refreshTaskBar():
+    """Refresh the task bar.
+    """
+    if os.name == "nt":
+        __refreshTaskBarWin32()
+    else:
+        __refreshTaskBarUnix()
+

[tuxdroid-svn] r5100 - in software_suite_v3/software/tool: tool-about-tux/trunk/resources tool-tuxbox-wb/trunk/executables

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-10 09:15:50 +0200 (Fri, 10 Jul 2009)
New Revision: 5100

Modified:
   software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
Log:
* Updated TuxBox name to "TuxBox 2.0"

Modified: software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki
===================================================================
--- software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki	2009-07-10 07:04:51 UTC (rev 5099)
+++ software_suite_v3/software/tool/tool-about-tux/trunk/resources/help.wiki	2009-07-10 07:15:50 UTC (rev 5100)
@@ -1,11 +1,11 @@
 \\
 \\
 
-{text-align:center;}[img:/d7c4218d-5a5c-4cdd-b515-0df7411c000f/icon.png, TuxBox]\\
+{text-align:center;}[img:/d7c4218d-5a5c-4cdd-b515-0df7411c000f/icon.png, TuxBox 2.0]\\
 \\
 
 {text-align:center;font-size:16px;}
-'''TuxBox'''\\
+'''TuxBox 2.0'''\\
 
 
 {text-align:center;}Version 0.0.1\\

Modified: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
===================================================================
(Binary files differ)

[tuxdroid-svn] r5099 - software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-10 09:04:51 +0200 (Fri, 10 Jul 2009)
New Revision: 5099

Modified:
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py
Log:
* Unreferencing the removed gadget (In case of duplicated gadget)

Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py	2009-07-10 06:30:37 UTC (rev 5098)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py	2009-07-10 07:04:51 UTC (rev 5099)
@@ -441,6 +441,7 @@
                     try:
                         # Remove the old gadget
                         os.remove(sGadget.getScgFile())
+                        self.__destroyGadget(sGadget)
                     except:
                         pass
                 # New gadget is older

[tuxdroid-svn] r5098 - software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-10 08:30:37 +0200 (Fri, 10 Jul 2009)
New Revision: 5098

Modified:
   software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py
Log:
* Remove duplicated gadgets. (alway remove the older version)

Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py	2009-07-09 10:00:43 UTC (rev 5097)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/gadget/GadgetsContainer.py	2009-07-10 06:30:37 UTC (rev 5098)
@@ -409,6 +409,44 @@
             else:
                 if os.name == "nt":
                     return None, "Platform"
+        def getSplitedGadgetVersion(theGadget):
+            vList = theGadget.getDescription().getVersion().split(".")
+            for i, v in enumerate(vList):
+                try:
+                    vList[i] = int(v)
+                except:
+                    vList[i] = 0
+            if len(vList) < 3:
+                if len(vList) < 2:
+                    if len(vList) < 1:
+                        vList.append(0)
+                    vList.append(0)
+                vList.append(0)
+            return vList
+        def cmpVersionGt(v1, v2):
+            for i in range(3):
+                if v1[i] > v2[i]:
+                    return True
+                elif v1[i] < v2[i]:
+                    return False
+            return False
+        # Check for duplicated plugin uuid
+        gadgetUuid = gadget.getDescription().getUuid()
+        gadgetVersion = getSplitedGadgetVersion(gadget)
+        for sGadget in self.__gadgets:
+            if sGadget.getDescription().getUuid() == gadgetUuid:
+                sGadgetVersion = getSplitedGadgetVersion(sGadget)
+                # New gadget is more recent
+                if cmpVersionGt(gadgetVersion, sGadgetVersion):
+                    try:
+                        # Remove the old gadget
+                        os.remove(sGadget.getScgFile())
+                    except:
+                        pass
+                # New gadget is older
+                else:
+                    # Can't accept this gadget ...
+                    return None, "Duplicated gadget UUID (%s)" % sGadget.getDescription().getName()
         # Add this gadget to the container
         self.__mutex.acquire()
         self.__gadgets.append(gadget)

[tuxdroid-svn] r5097 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-09 12:00:43 +0200 (Thu, 09 Jul 2009)
New Revision: 5097

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Fixed a missing import that was making this plugin not working on Linux.

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-09 08:27:28 UTC (rev 5096)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-09 10:00:43 UTC (rev 5097)
@@ -17,6 +17,7 @@
 import threading
 import subprocess
 import Skype4Py
+import commands
 
 sys.path.append(os.environ['TUXDROID_SERVER_PYTHON_UTIL'])
 
@@ -380,6 +381,14 @@
             #start skype
             self.__skypeProcess = subprocess.Popen("skype", stdin = subprocess.PIPE,
                 stdout = subprocess.PIPE)
+            while True:
+               try:
+                   buffer = self.__skypeProcess.stdout.read(100)
+               except:
+                   buffer = ""
+               if len(buffer) == 0:
+                   break
+            self.__activeMain = True
         else:
             self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
             self.__activeMain = False

[tuxdroid-svn] r5096 - software_suite_v3/smart-core/smart-server/trunk

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-09 10:27:28 +0200 (Thu, 09 Jul 2009)
New Revision: 5096

Modified:
   software_suite_v3/smart-core/smart-server/trunk/installer.nsi
   software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Updated version from 0.4.1-b1 to 0.4.1-b2.

Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi	2009-07-09 08:24:47 UTC (rev 5095)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi	2009-07-09 08:27:28 UTC (rev 5096)
@@ -4,7 +4,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.1-b1"
+!define PRODUCT_VERSION "0.4.1-b2"
 
 ; Output names
 !define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"

Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py	2009-07-09 08:24:47 UTC (rev 5095)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py	2009-07-09 08:27:28 UTC (rev 5096)
@@ -7,7 +7,7 @@
 #    Distributed under the terms of the GNU General Public License
 #    http://www.gnu.org/copyleft/gpl.html
 
-version = '0.4.1-b1'
+version = '0.4.1-b2'
 author = "Remi Jocaille (rem...@c2...)"
 licence = "GPL"
 date = "2009"

[tuxdroid-svn] r5095 - software_suite_v3/smart-core/smart-server/trunk/util/SimplePlugin

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-09 10:24:47 +0200 (Thu, 09 Jul 2009)
New Revision: 5095

Modified:
   software_suite_v3/smart-core/smart-server/trunk/util/SimplePlugin/SimplePlugin.py
Log:
* Fixed bug with self.isWindows() (replaced by os.name)


Modified: software_suite_v3/smart-core/smart-server/trunk/util/SimplePlugin/SimplePlugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/SimplePlugin/SimplePlugin.py	2009-07-09 08:23:45 UTC (rev 5094)
+++ software_suite_v3/smart-core/smart-server/trunk/util/SimplePlugin/SimplePlugin.py	2009-07-09 08:24:47 UTC (rev 5095)
@@ -19,7 +19,6 @@
 import sys
 import traceback
 import random
-import platform
 import threading
 import time
 
@@ -156,8 +155,7 @@
         """Get if the platform is Windows or not.
         @return: A boolean.
         """
-        platformName = platform.system().lower()
-        return (platformName == "microsoft") or (platformName == "windows")
+        return os.name == "nt"
 
     # --------------------------------------------------------------------------
     # Load the environement data to the plugin parameters.

[tuxdroid-svn] r5094 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-09 10:23:45 +0200 (Thu, 09 Jul 2009)
New Revision: 5094

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
*Modified the way to find Skype application on Linux.

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-09 08:21:39 UTC (rev 5093)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-09 08:23:45 UTC (rev 5094)
@@ -362,14 +362,23 @@
         """Start skype on linux ( thread needed to do not block the script ).
         """
         # Searching for skype binary.
-        cmd = ["skype", "--version"]
-        process = subprocess.Popen(cmd, stdin = subprocess.PIPE,
-            stdout = subprocess.PIPE)
-        result = process.stdout.read()
-        result = result.split()
-        if("Skype" in result) and ("Copyright" in result):
-            # Then skype is in PATH
-            self.__skypeProcess.Popen("skype", stdin = subprocess.PIPE,
+        result = []
+        found =False
+        
+        result = os.environ
+
+        result = result['PATH'].split(':')
+        
+        for path in result:
+           cmd = 'ls ' + path + ' | grep skype'
+           res = commands.getoutput(cmd)
+           if res.find('skype') >= 0:
+               found = True
+               break
+
+        if found:
+            #start skype
+            self.__skypeProcess = subprocess.Popen("skype", stdin = subprocess.PIPE,
                 stdout = subprocess.PIPE)
         else:
             self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")

[tuxdroid-svn] r5093 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-09 10:21:39 +0200 (Thu, 09 Jul 2009)
New Revision: 5093

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Fixed bug with self.isWindows() (replaced by os.name) which freeze the plugin when the stdin is handled by the server (daemon mode).
* Updated the way to launch skype application.

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-08 20:27:56 UTC (rev 5092)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-09 08:21:39 UTC (rev 5093)
@@ -117,7 +117,7 @@
                 self.__skype = None
                 self.__apiAttachState = -1
                 if self.__skypeProcess != None:
-                    if self.isWindows():
+                    if os.name == "nt":
                         import win32api
                         try:
                             win32api.TerminateProcess(int(
@@ -188,7 +188,7 @@
     def __selectTuxAsAudioCard(self):
         """Set tux as audio peripheral.
         """
-        if self.isWindows():
+        if os.name == "nt":
             import platform
             if int(platform.version().split(".")[0]) >= 6:
                 self.__sendCommandToSkype('SET AUDIO_IN TuxDroid-Micro (TuxDroid-Audio)')
@@ -305,7 +305,7 @@
     def __getSkypeAppConnected(self):
         """Check for skype connection
         """
-        if not self.isWindows():
+        if os.name != "nt":
             return len(commands.getoutput("ps -A | grep skype")) > 0
         else:
             cmd = ["tasklist", "/FI", "IMAGENAME eq skype.exe"]
@@ -322,7 +322,7 @@
         if self.__getSkypeAppConnected():
             return
         self.throwMessage("Please wait while I launch the skeyepe application")
-        if self.isWindows():
+        if os.name == "nt":
             thread = threading.Thread(target = self.__startSkypeAppWindows)
             thread.start()
         else:
@@ -334,13 +334,24 @@
         """
         if "ProgramFiles" in os.environ:
             try:
-                self.__skypeProcess = subprocess.Popen(
-                    os.environ["ProgramFiles"] + "\\Skype\\Phone\\Skype.exe",
-                    stdin = subprocess.PIPE, stdout = subprocess.PIPE)
-                result = self.__skypeProcess.stdout.read()
-                result.split()
-                if ("not" in result) and ("recognized" in result) \
-                    and ("command" in result):
+                skypePath = os.environ["ProgramFiles"] + "\\Skype\\Phone\\Skype.exe"
+                if os.path.isfile(skypePath):
+                    cmd = [
+                        skypePath,
+                        '"workforplugins"',
+                    ]
+                    self.__skypeProcess = subprocess.Popen(
+                        cmd,
+                        stdin = subprocess.PIPE,
+                        stdout = subprocess.PIPE)
+                    while True:
+                        try:
+                            buffer = self.__skypeProcess.stdout.read(100)
+                        except:
+                            buffer = ""
+                        if len(buffer) == 0:
+                            break
+                else:
                     self.throwMessage("Sorry, it looks like skeyepe is not installed. Please go to the skeyepe website to download the software.")
                     self.__activeMain = False
             except WindowsError:

[tuxdroid-svn] r5092 - software_suite_v3/smart-core/smart-server/trunk

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 22:27:56 +0200 (Wed, 08 Jul 2009)
New Revision: 5092

Modified:
   software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
Log:
* Kill old server children processes before to start the server. (Windows)

Modified: software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py	2009-07-08 14:54:39 UTC (rev 5091)
+++ software_suite_v3/smart-core/smart-server/trunk/tuxhttpserver.py	2009-07-08 20:27:56 UTC (rev 5092)
@@ -18,6 +18,38 @@
 
 from TDSConfiguration import *
 
+def killOldChildrenWin32():
+    import win32api
+    from win32com.client import GetObject
+    WMI = GetObject('winmgmts:')
+    processes = WMI.InstancesOf('Win32_Process')
+    pidToKill = []
+    for process in processes:
+        name = process.Properties_('Name').Value
+        cmdLine = process.Properties_('CommandLine').Value
+        if name == "python.exe":
+            if cmdLine.find('executables') != -1:
+                pidToKill.append(process.Properties_('ProcessId').Value)
+                continue
+        if cmdLine != None:
+            if cmdLine.lower().find('workforplugins') != -1:
+                pidToKill.append(process.Properties_('ProcessId').Value)
+                continue
+            if (cmdLine.lower().find('smart-server') != -1) and \
+                (cmdLine.lower().find('util') != -1):
+                pidToKill.append(process.Properties_('ProcessId').Value)
+                continue
+    for pid in pidToKill:
+        try:
+            handle = win32api.OpenProcess(1, False, pid)
+            win32api.TerminateProcess(handle, -1)
+            win32api.CloseHandle(handle)
+        except:
+            pass
+
+def killOldChildrenUnix():
+    pass
+
 def checkServerRun():
     import httplib
     h = httplib.HTTP("127.0.0.1:%d" % TDS_HTTP_PORT)
@@ -34,18 +66,22 @@
         return False
 
 def killServer():
+    if os.name == "nt":
+        killOldChildrenWin32()
+    else:
+        killOldChildrenUnix()
     import httplib
     h = httplib.HTTP("127.0.0.1:%d" % TDS_HTTP_PORT)
     try:
         h.connect()
+        h.putrequest("GET", "/server/stop?")
+        h.endheaders()
+        h.getreply()
+        h.putrequest("GET", "/server/stop?")
+        h.endheaders()
+        h.getreply()
     except:
         return
-    h.putrequest("GET", "/server/stop?")
-    h.endheaders()
-    h.getreply()
-    h.putrequest("GET", "/server/stop?")
-    h.endheaders()
-    h.getreply()
 
 def killServerAndWait():
     import time
@@ -55,6 +91,10 @@
         time.sleep(1.0)
 
 def runServer():
+    if os.name == "nt":
+        killOldChildrenWin32()
+    else:
+        killOldChildrenUnix()
     import TuxDroidServer
     from TuxDroidServer import initializeServer
     from TuxDroidServer import httpServer

[tuxdroid-svn] r5090 - software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 16:47:40 +0200 (Wed, 08 Jul 2009)
New Revision: 5090

Modified:
   software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations/00_resourceUsers.py
Log:
* Automatically launch the webbrowser (plugin) after the user configuration load.

Modified: software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations/00_resourceUsers.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations/00_resourceUsers.py	2009-07-08 14:38:14 UTC (rev 5089)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/05_user_configurations/00_resourceUsers.py	2009-07-08 14:47:40 UTC (rev 5090)
@@ -117,6 +117,10 @@
         # Start ugc server
         resourceUgcServer.startServer(os.path.join(TDS_USERS_CONF_PATH,
             userName, "ugcs"))
+        # Start the webbrowser (TuxBox)
+        t = threading.Thread(target = resourcePluginsServer.startPlugin,
+            args = ("63ef331b-eb82-4e4b-b246-07412191f263", "run", {}))
+        t.start()
         return result
 
     def getCurrentUserConfiguration(self):
@@ -124,7 +128,7 @@
         @return: The current user configuration as string.
         """
         return self.__userConfiguration
-        
+
     def getCurrentUserBasePath(self):
         """Get the current user base directory
         @return: A string.

[tuxdroid-svn] r5089 - in software_suite_v3/software/tool: . tool-tuxbox-wb tool-tuxbox-wb/trunk tool-tuxbox-wb/trunk/builder tool-tuxbox-wb/trunk/builder/util tool-tuxbox-wb/trunk/builder/util/misc tool-tuxbox-wb/trunk/executables tool-tuxbox-wb/trunk/resources

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 16:38:14 +0200 (Wed, 08 Jul 2009)
New Revision: 5089

Added:
   software_suite_v3/software/tool/tool-tuxbox-wb/
   software_suite_v3/software/tool/tool-tuxbox-wb/branches/
   software_suite_v3/software/tool/tool-tuxbox-wb/tags/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/LICENSE
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/build.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/PluginPackager.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/__init__.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/__init__.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/DirectoriesAndFilesTools.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/__init__.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/version.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/version.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/plugin-tuxbox.py
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/help.wiki
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/icon.png
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.pot
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.xml
Log:
* Embedded a Tux Droid Webbrowser into a plugin. (This webbrowser have minimal functionalities)
* Current name of the webbrowser is "TuxBox"
* This plugin/tool will be automatically launched by the server on Windows.

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/LICENSE
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/LICENSE	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/build.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/build.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/build.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+#    Copyleft (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+from builder.PluginPackager import PluginPackager
+
+if __name__ == "__main__":
+    PluginPackager().createScp("tool-tuxbox-wb.scp")

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/PluginPackager.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/PluginPackager.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/PluginPackager.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+
+import version
+__author__ = version.author
+__date__ = version.date
+__version__ = version.version
+__licence__ = version.licence
+del version
+
+#    Copyleft (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+import os
+from zipfile import *
+
+from util.misc.DirectoriesAndFilesTools import *
+
+# ------------------------------------------------------------------------------
+# Class to create a SCP file from the main directory of a python plugin project.
+# ------------------------------------------------------------------------------
+class PluginPackager(object):
+    """Class to create a SCP file from the main directory of a python plugin
+    project.
+    """
+
+    # --------------------------------------------------------------------------
+    # Create a scp file.
+    # --------------------------------------------------------------------------
+    def createScp(self, scpFileName):
+        """Create a scp file.
+        @param scpFileName: Smart-Core Plugin file name.
+        @return: The success of the file creation.
+        """
+        self.__sourcePath = os.path.realpath("")
+        if not os.path.isdir(self.__sourcePath):
+            return False
+        if not os.path.isdir(os.path.join(self.__sourcePath, "executables")):
+            return False
+        if not os.path.isdir(os.path.join(self.__sourcePath, "resources")):
+            return False
+        # Get some paths
+        SRC_EXECUTABLES_PATH = os.path.join(self.__sourcePath, "executables")
+        SRC_RESOURCES_PATH = os.path.join(self.__sourcePath, "resources")
+        TMP_BUILD_PATH = os.path.join(self.__sourcePath, "tmp")
+        DEST_EXECUTABLES_PATH = os.path.join(TMP_BUILD_PATH, "executables")
+        DEST_RESOURCES_PATH = os.path.join(TMP_BUILD_PATH, "resources")
+        DEST_SCP_FILENAME = os.path.join(self.__sourcePath, scpFileName)
+        # Create the temporary build path
+        MKDirsF(TMP_BUILD_PATH)
+        # Copy "executables" directory
+        CPDir(SRC_EXECUTABLES_PATH, DEST_EXECUTABLES_PATH)
+        # Copy "resources" directory
+        CPDir(SRC_RESOURCES_PATH, DEST_RESOURCES_PATH)
+        # Filtering the content of temporary path
+        RMWithFilters(TMP_BUILD_PATH, filters = ['.svn', '.pyc'])
+        # Create a zip file
+        directory = TMP_BUILD_PATH
+        last_cwd = os.getcwd()
+        os.chdir(TMP_BUILD_PATH)
+        zf = ZipFile(DEST_SCP_FILENAME, 'w', compression = ZIP_DEFLATED)
+        def walker(zip, directory, files, root = directory):
+            for file in files:
+                file = os.path.join(directory, file)
+                name = file[len(TMP_BUILD_PATH) + 1:]
+                if os.path.isfile(file):
+                    zip.write(file, name, ZIP_DEFLATED)
+                elif os.path.isdir(file):
+                    file = os.path.join(file, "")
+                    name = os.path.join(name, "")
+                    zip.writestr(name, name)
+        os.path.walk(TMP_BUILD_PATH, walker, zf)
+        zf.close()
+        os.chdir(os.path.abspath(last_cwd))
+        # Remove the temporary directory
+        RMDirs(TMP_BUILD_PATH)
+        return True

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/__init__.py
===================================================================

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/__init__.py
===================================================================

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/DirectoriesAndFilesTools.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/DirectoriesAndFilesTools.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/DirectoriesAndFilesTools.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,161 @@
+# -*- coding: utf-8 -*-
+
+import version
+__author__ = version.author
+__date__ = version.date
+__version__ = version.version
+__licence__ = version.licence
+del version
+
+#    Copyleft (C) 2008 Acness World
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+import os
+import shutil
+
+if os.name == 'nt':
+    import win32con
+    import win32file
+
+# ==============================================================================
+# Public functions
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# Force to create a directories tree if not exists.
+# ------------------------------------------------------------------------------
+def MKDirs(path):
+    """Force to create a directories tree if not exists.
+    @param path: Directory path.
+    """
+    if not os.path.isdir(path):
+        try:
+            os.makedirs(path)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Force to create a directories tree after having deleted the old one.
+# ------------------------------------------------------------------------------
+def MKDirsF(path):
+    """Force to create a directories tree after having deleted the old one.
+    @param path: Directory path.
+    """
+    if os.path.isdir(path):
+        RMDirs(path)
+    os.makedirs(path)
+
+# ------------------------------------------------------------------------------
+# Remove directories and files recursively.
+# ------------------------------------------------------------------------------
+def RMDirs(path):
+    """Remove directories and files recursively.
+    @param path: Path of the base directory.
+    """
+    if not os.path.isdir(path):
+        return
+    for root, dirs, files in os.walk(path, topdown = False):
+        for d in dirs:
+            try:
+                os.removedirs(os.path.join(root, d))
+            except:
+                pass
+        for f in files:
+            try:
+                if os.name == 'nt':
+                    win32file.SetFileAttributesW(os.path.join(root, f),
+                        win32con.FILE_ATTRIBUTE_NORMAL)
+                os.remove(os.path.join(root, f))
+            except:
+                pass
+    if os.path.isdir(path):
+        try:
+            os.removedirs(path)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Remove directories and files recursively with filters.
+# ------------------------------------------------------------------------------
+def RMWithFilters(path, filters = ['.pyc', '.pyo']):
+    """Remove directories and files recursively with filters.
+    @param path: Path of the base directory.
+    @param filters: Filters as list.
+    """
+    def checkFilter(name):
+        for filter in filters:
+            if name.lower().find(filter.lower()) == (len(name) - len(filter)):
+                return True
+        return False
+
+    if not os.path.isdir(path):
+        return
+
+    for root, dirs, files in os.walk(path, topdown = False):
+        for d in dirs:
+            if checkFilter(os.path.join(root, d)):
+                try:
+                    RMDirs(os.path.join(root, d))
+                except:
+                    pass
+        for f in files:
+            if checkFilter(os.path.join(root, f)):
+                try:
+                    if os.name == 'nt':
+                        win32file.SetFileAttributesW(os.path.join(root, f),
+                            win32con.FILE_ATTRIBUTE_NORMAL)
+                    os.remove(os.path.join(root, f))
+                except:
+                    pass
+
+# ------------------------------------------------------------------------------
+# Remove a file.
+# ------------------------------------------------------------------------------
+def RMFile(path):
+    """Remove a file.
+    @param path: File path.
+    """
+    if os.path.isfile(path):
+        try:
+            if os.name == 'nt':
+                win32file.SetFileAttributesW(path,
+                    win32con.FILE_ATTRIBUTE_NORMAL)
+            os.remove(path)
+        except:
+            pass
+
+# ------------------------------------------------------------------------------
+# Copy a directories tree to another directory.
+# ------------------------------------------------------------------------------
+def CPDir(src, dest):
+    """Copy a directories tree to another directory.
+    @param src: Source path.
+    @param dest: Destination path.
+    """
+    if not os.path.isdir(src):
+        return
+    if os.path.isdir(dest):
+        RMDirs(dest)
+    shutil.copytree(src, dest)
+
+# ------------------------------------------------------------------------------
+# Retrieve the OS temporary directory.
+# ------------------------------------------------------------------------------
+def GetOSTMPDir():
+    """Retrieve the OS temporary directory.
+    @return: The OS temporary directory.
+    """
+    result = None
+    # On Windows
+    if os.name == 'nt':
+        result = os.environ.get('tmp')
+        if result == None:
+            result = os.environ.get('temp')
+            if result == None:
+                result = "c:\\windows\\temp"
+    # On linux
+    else:
+        result = "/tmp"
+    return result

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/__init__.py
===================================================================

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/version.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/version.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/util/misc/version.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+"""Version data for tuxisalive.lib.Util"""
+
+__author__ = "Remi Jocaille (rem...@c2...)"
+
+#    Copyleft (C) 2008 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+name = 'util.misc'
+version = '0.0.1'
+author = "Remi Jocaille (rem...@c2...)"
+
+description = "Utilities libraries."
+
+licence = "GPL"
+date = "December 2008"

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/version.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/version.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/builder/version.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,9 @@
+#    Copyleft (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+version = '0.0.1'
+author = "Remi Jocaille (rem...@c2...)"
+licence = "GPL"
+date = "2009"

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
===================================================================
(Binary files differ)


Property changes on: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,127 @@
+#    Copyright (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+import os
+import subprocess
+import threading
+import time
+
+# ------------------------------------------------------------------------------
+# TuxBox wrapper.
+# ------------------------------------------------------------------------------
+class TuxBox(object):
+    """TuxBox wrapper.
+    """
+
+    # --------------------------------------------------------------------------
+    # Constructor of the class.
+    # --------------------------------------------------------------------------
+    def __init__(self):
+        """Constructor of the class.
+        """
+        mPath, mFile = os.path.split(__file__)
+        self.__appTuxBox = os.path.join(mPath, 'TuxBox.exe')
+        self.__runMutex = threading.Lock()
+        self.__run = False
+        self.__process = None
+        self.__isAsync = False
+
+    # --------------------------------------------------------------------------
+    # Start TuxBox.
+    # --------------------------------------------------------------------------
+    def start(self, useAsync = False):
+        """Start TuxBox.
+        @param useAsync: Run async or not.
+        """
+        self.__isAsync = useAsync
+        if not useAsync:
+            self.__mainLoop()
+        else:
+            t = threading.Thread(target = self.__mainLoop)
+            t.start()
+
+    # --------------------------------------------------------------------------
+    # Stop TuxBox.
+    # --------------------------------------------------------------------------
+    def stop(self):
+        """Stop TuxBox.
+        """
+        if not self.__getRun():
+            return
+        if self.__process != None:
+            import win32api
+            try:
+                win32api.TerminateProcess(int(self.__process._handle), -1)
+            except:
+                pass
+        self.__setRun(False)
+        self.__process = None
+        time.sleep(0.25)
+
+    # --------------------------------------------------------------------------
+    # Restart TuxBox.
+    # --------------------------------------------------------------------------
+    def restart(self):
+        """Restart TuxBox.
+        """
+        self.stop()
+        self.start(self.__isAsync)
+
+    # --------------------------------------------------------------------------
+    # Get if TuxBox is started or not.
+    # --------------------------------------------------------------------------
+    def __getRun(self):
+        """Get if TuxBox is started or not.
+        @return: True or False.
+        """
+        self.__runMutex.acquire()
+        result = self.__run
+        self.__runMutex.release()
+        return result
+
+    # --------------------------------------------------------------------------
+    # Get if TuxBox is started or not.
+    # --------------------------------------------------------------------------
+    def isStarted(self):
+        """Get if TuxBox is started or not.
+        @return: True or False.
+        """
+        return self.__getRun()
+
+    # --------------------------------------------------------------------------
+    # Set the run flag value.
+    # --------------------------------------------------------------------------
+    def __setRun(self, value):
+        """Set the run flag value.
+        @param value: Flag value. <True|False>
+        """
+        self.__runMutex.acquire()
+        self.__run = value
+        self.__runMutex.release()
+
+    # --------------------------------------------------------------------------
+    # Main loop of TuxBox.
+    # --------------------------------------------------------------------------
+    def __mainLoop(self):
+        """Main loop of TuxBox.
+        """
+        if self.__getRun():
+            return
+        self.__setRun(True)
+        cmd = [
+            self.__appTuxBox ,
+        ]
+        self.__process = subprocess.Popen(
+            cmd,
+            stdin = subprocess.PIPE,
+            stdout = subprocess.PIPE,
+            stderr = subprocess.PIPE)
+        while self.__getRun():
+            try:
+                buffer = self.__process.stdout.read(100)
+            except:
+                buffer = ""
+            if len(buffer) == 0:
+                self.stop()

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/plugin-tuxbox.py
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/plugin-tuxbox.py	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/plugin-tuxbox.py	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright (C) 2009 Kysoh Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+__author__  = "Kysoh"
+__appname__ = "TuxBox tool"
+__version__ = "0.0.1"
+__date__    = "2009/07/08"
+__license__ = "GPL"
+
+import os
+import time
+import sys
+import threading
+
+sys.path.append(os.environ['TUXDROID_SERVER_PYTHON_UTIL'])
+
+from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
+from util.SimplePlugin.SimplePlugin import SimplePlugin
+from TuxBox import TuxBox
+
+class TuxBoxPlugin(SimplePlugin):
+    """This class override the SimplePlugin class to make easy
+    the plugin coding.
+    """
+
+    def __init__(self):
+        """Initialization of the class.
+        """
+        # Call the super class
+        SimplePlugin.__init__(self)
+        self.__tuxBox = TuxBox()
+
+    def start(self):
+        """Plugin entry point.
+        This method should be used to dispatch commands.
+        """
+        if os.name == "nt":
+            if self.getCommand() == "run":
+                self.run()
+            else:
+                self.run()
+        else:
+            self.stop()
+
+    def run(self):
+        """Plugin entry point for the "run" command.
+        """
+        self.__tuxBox.start(True)
+
+    def onPluginStop(self):
+        """Callback on plugin stop.
+        """
+        self.__tuxBox.stop()
+
+    def onPluginEvent(self, eventName, eventValues):
+        """Callback on plugin event.
+        @param eventName: Event name.
+        @param eventValues: Event values.
+        """
+        pass
+
+if __name__ == "__main__":
+    plugin = TuxBoxPlugin()
+    plugin.boot(sys.argv[1:], SimplePluginConfiguration())

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/help.wiki
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/help.wiki	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/help.wiki	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,2 @@
+= Synopsis =
+TuxBox webbrowser.

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/icon.png
===================================================================
(Binary files differ)


Property changes on: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/icon.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.pot
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.pot	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.pot	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,11 @@
+msgid "TuxBox"
+msgstr ""
+
+msgid "TuxBox."
+msgstr ""
+
+msgid "TuxBox webbrowser."
+msgstr ""
+
+msgid "Start TuxBox webbrowser"
+msgstr ""

Added: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.xml	                        (rev 0)
+++ software_suite_v3/software/tool/tool-tuxbox-wb/trunk/resources/plugin.xml	2009-07-08 14:38:14 UTC (rev 5089)
@@ -0,0 +1,25 @@
+<plugin>
+	<interpreter
+		kind="python">
+		<executable>executables/plugin-tuxbox.py</executable>
+	</interpreter>
+	<description>
+		<name>TuxBox</name>
+        <ttsName>TuxBox.</ttsName>
+		<description>TuxBox webbrowser.</description>
+		<author>Jérôme Conan</author>
+		<version>0.0.2</version>
+		<iconFile>resources/icon.png</iconFile>
+		<uuid>63ef331b-eb82-4e4b-b246-07412191f263</uuid>
+        <platform>all</platform>
+	</description>
+	<parameters/>
+	<commands>
+		<command
+			name="run"
+			description="Start TuxBox webbrowser"
+            daemon="true"
+            notifier="true" />
+	</commands>
+    <tasks/>
+</plugin>

[tuxdroid-svn] r5091 - software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 16:54:39 +0200 (Wed, 08 Jul 2009)
New Revision: 5091

Modified:
   software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
Log:
* Updated TuxBox.exe

Modified: software_suite_v3/software/tool/tool-tuxbox-wb/trunk/executables/TuxBox.exe
===================================================================
(Binary files differ)

[tuxdroid-svn] r5088 - software_suite_v3/smart-core/smart-server/trunk

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 14:10:37 +0200 (Wed, 08 Jul 2009)
New Revision: 5088

Modified:
   software_suite_v3/smart-core/smart-server/trunk/installer.nsi
   software_suite_v3/smart-core/smart-server/trunk/version.py
Log:
* Updated version to 0.4.1-b1

Modified: software_suite_v3/smart-core/smart-server/trunk/installer.nsi
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/installer.nsi	2009-07-08 12:08:29 UTC (rev 5087)
+++ software_suite_v3/smart-core/smart-server/trunk/installer.nsi	2009-07-08 12:10:37 UTC (rev 5088)
@@ -4,7 +4,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Smart Server"
-!define PRODUCT_VERSION "0.4.0"
+!define PRODUCT_VERSION "0.4.1-b1"
 
 ; Output names
 !define FINAL_INSTALLER_EXE "SmartServerInstaller_${PRODUCT_VERSION}.exe"

Modified: software_suite_v3/smart-core/smart-server/trunk/version.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/version.py	2009-07-08 12:08:29 UTC (rev 5087)
+++ software_suite_v3/smart-core/smart-server/trunk/version.py	2009-07-08 12:10:37 UTC (rev 5088)
@@ -7,7 +7,7 @@
 #    Distributed under the terms of the GNU General Public License
 #    http://www.gnu.org/copyleft/gpl.html
 
-version = '0.4.0'
+version = '0.4.1-b1'
 author = "Remi Jocaille (rem...@c2...)"
 licence = "GPL"
 date = "2009"

[tuxdroid-svn] r5087 - software_suite_v3/smart-core/smart-server/tags

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 14:08:29 +0200 (Wed, 08 Jul 2009)
New Revision: 5087

Added:
   software_suite_v3/smart-core/smart-server/tags/0.4.0/
Log:
* Tagged to 0.4.0 - First version with an auto updater on Windows.

Copied: software_suite_v3/smart-core/smart-server/tags/0.4.0 (from rev 5085, software_suite_v3/smart-core/smart-server/trunk)

[tuxdroid-svn] r5086 - in software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv: resources src/com/kysoh/tvPrograms/plugin

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-08 14:02:34 +0200 (Wed, 08 Jul 2009)
New Revision: 5086

Modified:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
Log:
* Improved the fix : possible tts output bug related to the '&' character 
* Updated two channels into the plugin.xml file that was not working.

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml	2009-07-08 11:29:23 UTC (rev 5085)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml	2009-07-08 12:02:34 UTC (rev 5086)
@@ -37,7 +37,7 @@
 			category="Options"
 			name="flandreChannel"
 			description="Select your Belgian Dutch channel"
-			type="enum(Vijf TV, Prime One, Prime Action, Prime Movies, Canvas, Fashion TV Prime Fezztival, 
+			type="enum(Vijf TV, Prime One, Prime Action, Prime Movies, Canvas, Fashion TV, Prime Fezztival, 
                        JIM,KANAALTWEE, Ketnet, MTV Netherland, Prime Sport, The Music Factory, Trace TV, Vitaya, VT4, VTM)"
 			defaultValue="Vijf TV" />
         <parameter

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java	2009-07-08 11:29:23 UTC (rev 5085)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java	2009-07-08 12:02:34 UTC (rev 5086)
@@ -83,9 +83,9 @@
 			if(!configuration.getGiveNowPlaying())
 			{
 				channel = programme.get(0).getChannel();
-				if(channel.contains("&"))
+				if(channel.contains(" & "))
 				{
-					channel = channel.replace("&", "&&");
+					channel = channel.replace(" & ", " && ");
 				}
 				
 				gadget.throwMessage("On {0}", channel);
@@ -103,18 +103,19 @@
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
 				{
 					title = oneProgram.getTitle();
-					if(title.contains("&"))
+					
+					if(title.contains(" & "))
 					{
-						title = title.replace("&", "&&");
+						title = title.replace(" & ", " && ");
 					}
 					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), title);
 				}
 				else
 				{
 					title = oneProgram.getTitle();
-					if(title.contains("&"))
+					if(title.contains(" & "))
 					{
-						title = title.replace("&", "&&");
+						title = title.replace(" & ", " && ");
 					}
 					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), title, oneProgram.getDescription());
 				}
@@ -129,9 +130,9 @@
 			if(!configuration.getGiveNowPlaying())
 			{
 				channel = programme.get(0).getChannel();
-				if(channel.contains("&"))
+				if(channel.contains(" & "))
 				{
-					channel = channel.replace("&", "&&");
+					channel = channel.replace(" & ", " && ");
 				}
 				gadget.throwMessage("On {0}", channel);
 			}
@@ -149,18 +150,18 @@
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
 				{
 					title = oneProgram.getTitle();
-					if(title.contains("&"))
+					if(title.contains(" & "))
 					{
-						title = title.replace("&", "&&");
+						title = title.replace(" & ", " && ");
 					}
 					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), title);
 				}
 				else
 				{
 					title = oneProgram.getTitle();
-					if(title.contains("&"))
+					if(title.contains(" & "))
 					{
-						title = title.replace("&", "&&");
+						title = title.replace(" & ", " && ");
 					}
 					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), title , oneProgram.getDescription());
 				}
@@ -175,9 +176,9 @@
 			if(!configuration.getGiveNowPlaying())
 			{
 				channel = programme.get(0).getChannel();
-				if(channel.contains("&"))
+				if(channel.contains(" & "))
 				{
-					channel = channel.replace("&", "&&");
+					channel = channel.replace(" & ", " && ");
 				}
 				gadget.throwMessage("On {0}", channel);
 			}
@@ -194,18 +195,18 @@
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
 				{
 					title = oneProgram.getTitle();
-					if(title.contains("&"))
+					if(title.contains(" & "))
 					{
-						title = title.replace("&", "&&");
+						title = title.replace(" & ", " && ");
 					}
 					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), title);
 				}
 				else
 				{
 					title = oneProgram.getTitle();
-					if(title.contains("&"))
+					if(title.contains(" & "))
 					{
-						title = title.replace("&", "&&");
+						title = title.replace(" & ", " && ");
 					}
 					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), title, oneProgram.getDescription());
 				}

[tuxdroid-svn] r5085 - in software_suite_v3/smart-core/smart-server/trunk: data/web_interface/devel/js data/web_interface/user_01/js resources/07_web_interfaces

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-08 13:29:23 +0200 (Wed, 08 Jul 2009)
New Revision: 5085

Modified:
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/js/common.js
   software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js
   software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/00_resourceWIDevel.py
   software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
Log:
* "+" symbol is irrelevant in the http requests. Added an encoding for this symbol.

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/js/common.js
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/js/common.js	2009-07-08 11:27:33 UTC (rev 5084)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/devel/js/common.js	2009-07-08 11:29:23 UTC (rev 5085)
@@ -34,6 +34,7 @@
     value = value.replace(/\|/g, '[PIPE]');
     value = value.replace(/\=/g, '[EQUAL]');
     value = value.replace(/\&/g, '[AMP]');
+    value = value.replace(/\+/g, '[PLUS]');
     return value;
 }
 

Modified: software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js	2009-07-08 11:27:33 UTC (rev 5084)
+++ software_suite_v3/smart-core/smart-server/trunk/data/web_interface/user_01/js/common.js	2009-07-08 11:29:23 UTC (rev 5085)
@@ -34,6 +34,7 @@
     value = value.replace(/\|/g, '[PIPE]');
     value = value.replace(/\=/g, '[EQUAL]');
     value = value.replace(/\&/g, '[AMP]');
+    value = value.replace(/\+/g, '[PLUS]');
     return value;
 }
 

Modified: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/00_resourceWIDevel.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/00_resourceWIDevel.py	2009-07-08 11:27:33 UTC (rev 5084)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/00_resourceWIDevel.py	2009-07-08 11:29:23 UTC (rev 5085)
@@ -201,6 +201,7 @@
                 value = value.replace('[EQUAL]', '=')
                 value = value.replace('[PIPE]', '|')
                 value = value.replace('[AMP]', '&')
+                value = value.replace('[PLUS]', '+')
                 params.append([name, value])
         tmpGadgetUrl, nUuid = GadgetGenerator.generateGadget(oUuid, params,
             resourcePluginsServer.getPluginsContainer().getPluginByUuid(uuid),
@@ -247,6 +248,7 @@
                 value = value.replace('[EQUAL]', '=')
                 value = value.replace('[PIPE]', '|')
                 value = value.replace('[AMP]', '&')
+                value = value.replace('[PLUS]', '+')
                 params.append([name, value])
         tmpUgcUrl, nUuid = GadgetGenerator.updateUgc(
             resourceUgcServer.getUgcContainer().getUgcByUuid(uuid), params,
@@ -293,6 +295,7 @@
                 value = value.replace('[EQUAL]', '=')
                 value = value.replace('[PIPE]', '|')
                 value = value.replace('[AMP]', '&')
+                value = value.replace('[PLUS]', '+')
                 params.append([name, value])
         resourceWIDevel.gadgetPreviewData = GadgetGenerator.generatePreviewGadget(params,
             resourcePluginsServer.getPluginsContainer().getPluginByUuid(uuid),

Modified: software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py	2009-07-08 11:27:33 UTC (rev 5084)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/07_web_interfaces/01_resourceWIUser01.py	2009-07-08 11:29:23 UTC (rev 5085)
@@ -446,6 +446,7 @@
                 value = value.replace('[EQUAL]', '=')
                 value = value.replace('[PIPE]', '|')
                 value = value.replace('[AMP]', '&')
+                value = value.replace('[PLUS]', '+')
                 params.append([name, value])
         tmpUgcUrl, nUuid = GadgetGenerator.updateUgc(
             resourceUgcServer.getUgcContainer().getUgcByUuid(uuid), params,

[tuxdroid-svn] r5084 - software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/programs

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-08 13:27:33 +0200 (Wed, 08 Jul 2009)
New Revision: 5084

Modified:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Give error message in case of Date update error.

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/programs/SimplePrograms.java	2009-07-08 10:48:49 UTC (rev 5083)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/programs/SimplePrograms.java	2009-07-08 11:27:33 UTC (rev 5084)
@@ -195,6 +195,7 @@
 		else
 		{
 			this.triggerError();
+			return new Vector<Program>();
 		}
 		
 		return programs;
@@ -236,24 +237,33 @@
 		//Getting web link.
 		for (String str : spl)
 		{
+			if(str == null)
+				return null;
+			
 			if((str.length() > 0) && (!str.contains("</b><p>")) && (!str.contains("</B><p>")) && (!str.contains("http://")))
 			{
-				String day = str.substring(str.indexOf("\">") + 2, str.indexOf(" "));
-				String dMonth = str.substring(str.indexOf(day) + day.length() + 1);
-				
-				dMonth = dMonth.substring(0, dMonth.indexOf(" "));
-				
-				if(Integer.valueOf(dMonth).intValue() == currentNDay)
+				try
 				{
-					try
+					String day = str.substring(str.indexOf("\">") + 2, str.indexOf(" "));
+					String dMonth = str.substring(str.indexOf(day) + day.length() + 1);
+					dMonth = dMonth.substring(0, dMonth.indexOf(" "));
+					if(Integer.valueOf(dMonth).intValue() == currentNDay)
 					{
-						return HTMLUtils.getPage(this.url, str.substring(0, str.indexOf("\">")));
+						try
+						{
+							return HTMLUtils.getPage(this.url, str.substring(0, str.indexOf("\">")));
+						}
+						catch(StringIndexOutOfBoundsException error)
+						{
+							this.triggerError();
+						}
 					}
-					catch(StringIndexOutOfBoundsException error)
-					{
-						error.printStackTrace();
-					}
 				}
+				catch(StringIndexOutOfBoundsException dateError)
+				{
+					this.triggerError();
+					return null;
+				}
 			}
 		}
 		

[tuxdroid-svn] r5083 - software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-08 12:48:49 +0200 (Wed, 08 Jul 2009)
New Revision: 5083

Modified:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
Log:
* Fixed a possible tts output bug related to the '&' character 

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java	2009-07-08 10:19:07 UTC (rev 5082)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java	2009-07-08 10:48:49 UTC (rev 5083)
@@ -42,13 +42,27 @@
 			Program nowPlaying = SimplePrograms.getNowPlaying(programme);
 			if(nowPlaying != null)
 			{
-				gadget.throwMessage("Now playing on {0}. {1}", nowPlaying.getChannel(), nowPlaying.getTitle());
+				String np = nowPlaying.getTitle();
 				
+				if(np.contains("&"))
+				{
+					np = np.replace("&", "&&");
+				}
+				
+				gadget.throwMessage("Now playing on {0}. {1}", nowPlaying.getChannel(), np);
+				
 				Program nextPlaying = SimplePrograms.getNextPlaying(programme, nowPlaying);
 				
 				if(nextPlaying != null)
 				{
-					gadget.throwMessage("Next playing {0} at {1}", nextPlaying.getTitle(), nextPlaying.getStartTime());
+					np = nextPlaying.getTitle();
+					
+					if(np.contains("&"))
+					{
+						np = np.replace("&", "&&");
+					}
+					
+					gadget.throwMessage("Next playing {0} at {1}", np, nextPlaying.getStartTime());
 				}
 				
 			}
@@ -58,6 +72,9 @@
 			}
 		}
 	
+		String channel = "";
+		String title = "";
+		
 		//Morning program.
 		if(configuration.getGiveMorning())
 		{
@@ -65,7 +82,13 @@
 			
 			if(!configuration.getGiveNowPlaying())
 			{
-				gadget.throwMessage("On {0}", programme.get(0).getChannel());
+				channel = programme.get(0).getChannel();
+				if(channel.contains("&"))
+				{
+					channel = channel.replace("&", "&&");
+				}
+				
+				gadget.throwMessage("On {0}", channel);
 			}
 			
 			Vector<Program> morning = SimplePrograms.sortMorning(programme);
@@ -79,11 +102,21 @@
 			{
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
 				{
-					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), oneProgram.getTitle());
+					title = oneProgram.getTitle();
+					if(title.contains("&"))
+					{
+						title = title.replace("&", "&&");
+					}
+					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), title);
 				}
 				else
 				{
-					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
+					title = oneProgram.getTitle();
+					if(title.contains("&"))
+					{
+						title = title.replace("&", "&&");
+					}
+					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), title, oneProgram.getDescription());
 				}
 			}
 		}
@@ -95,7 +128,12 @@
 			
 			if(!configuration.getGiveNowPlaying())
 			{
-				gadget.throwMessage("On {0}", programme.get(0).getChannel());
+				channel = programme.get(0).getChannel();
+				if(channel.contains("&"))
+				{
+					channel = channel.replace("&", "&&");
+				}
+				gadget.throwMessage("On {0}", channel);
 			}
 			
 			Vector<Program> afternoon = SimplePrograms.sortAfternoon(programme);
@@ -110,11 +148,21 @@
 				
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
 				{
-					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), oneProgram.getTitle());
+					title = oneProgram.getTitle();
+					if(title.contains("&"))
+					{
+						title = title.replace("&", "&&");
+					}
+					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), title);
 				}
 				else
 				{
-					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
+					title = oneProgram.getTitle();
+					if(title.contains("&"))
+					{
+						title = title.replace("&", "&&");
+					}
+					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), title , oneProgram.getDescription());
 				}
 			}
 		}
@@ -126,7 +174,12 @@
 			
 			if(!configuration.getGiveNowPlaying())
 			{
-				gadget.throwMessage("On {0}", programme.get(0).getChannel());
+				channel = programme.get(0).getChannel();
+				if(channel.contains("&"))
+				{
+					channel = channel.replace("&", "&&");
+				}
+				gadget.throwMessage("On {0}", channel);
 			}
 			
 			Vector<Program> evening = SimplePrograms.sortEvening(programme);
@@ -140,11 +193,21 @@
 			{
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
 				{
-					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), oneProgram.getTitle());
+					title = oneProgram.getTitle();
+					if(title.contains("&"))
+					{
+						title = title.replace("&", "&&");
+					}
+					gadget.throwMessage("{0}, {1}", oneProgram.getStartTime(), title);
 				}
 				else
 				{
-					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
+					title = oneProgram.getTitle();
+					if(title.contains("&"))
+					{
+						title = title.replace("&", "&&");
+					}
+					gadget.throwMessage("{0}, {1}, {2}", oneProgram.getStartTime(), title, oneProgram.getDescription());
 				}
 			}
 		}

[tuxdroid-svn] r5082 - in software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv: resources src/com/kysoh/tvPrograms/plugin

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-08 12:19:07 +0200 (Wed, 08 Jul 2009)
New Revision: 5082

Modified:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginStart.java
Log:
* Fixed 'flandre' ==> 'Vlaanderen'

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml	2009-07-08 10:14:30 UTC (rev 5081)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml	2009-07-08 10:19:07 UTC (rev 5082)
@@ -20,7 +20,7 @@
 			category="Options"
 			name="countr"
 			description="Select a country"
-			type="enum(France, Flandre, Wallonnie, Espana, Deutschland, Nederland, United Kingdom)"
+			type="enum(France, Vlaanderen, Wallonnie, Espana, Deutschland, Nederland, United Kingdom)"
 			defaultValue="France" />
         <parameter
 			category="Options"

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginStart.java
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginStart.java	2009-07-08 10:14:30 UTC (rev 5081)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginStart.java	2009-07-08 10:19:07 UTC (rev 5082)
@@ -50,7 +50,7 @@
 			new PluginFr().main(arguments, this.configuration());
 		}
 		
-		else if(country.equalsIgnoreCase("flandre"))
+		else if(country.equalsIgnoreCase("Vlaanderen"))
 		{
 			this.configuration().setChannel(this.configuration().getFlandreChannel());
 			new PluginBeDu().main(arguments, this.configuration());

[tuxdroid-svn] r5081 - software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-07-08 12:14:30 +0200 (Wed, 08 Jul 2009)
New Revision: 5081

Modified:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginUk.java
Log:
* Fixed a bug retrieving Tv program for this country.

Modified: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginUk.java
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginUk.java	2009-07-08 09:15:58 UTC (rev 5080)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginUk.java	2009-07-08 10:14:30 UTC (rev 5081)
@@ -44,7 +44,7 @@
 		   configuration().getGiveMorning() || configuration().getGiveNowPlaying())
 		{
 			SimplePrograms.addProgramLoadListener(this);
-			ukPrograms = new SimplePrograms(SimplePrograms.UK, this.configuration().getChannel());
+			ukPrograms = new SimplePrograms(SimplePrograms.UK, this.configuration().getUkChannel());
 		}
 		else
 		{