[tuxdroid-svn] r935 - software/tuxosl/trunk

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

Author: remi
Date: 2008-03-06 15:27:14 +0100 (Thu, 06 Mar 2008)
New Revision: 935

Modified:
   software/tuxosl/trunk/tux_osl_api.py
   software/tuxosl/trunk/tux_osl_daemon.py
   software/tuxosl/trunk/tux_osl_event_cmd_client.py
Log:
UPD

Modified: software/tuxosl/trunk/tux_osl_api.py
===================================================================
--- software/tuxosl/trunk/tux_osl_api.py	2008-03-06 14:26:44 UTC (rev 934)
+++ software/tuxosl/trunk/tux_osl_api.py	2008-03-06 14:27:14 UTC (rev 935)
@@ -150,6 +150,11 @@
         pass
         
     def _tts_speak(self, text):
+        if str(type(text)) != "<type 'str'>":
+            return False
+        t_text = text.replace(' ', '')
+        if len(t_text) == 0:
+            return False
         self.__tts_mutex.acquire()
         result = True
         channel = self.__osl_obj.tts.speak(text, self.tts._locutor, self.tts._pitch)
@@ -164,6 +169,11 @@
         return result
         
     def _tts_speak_free(self, text):
+        if str(type(text)) != "<type 'str'>":
+            return False
+        t_text = text.replace(' ', '')
+        if len(t_text) == 0:
+            return False
         self.__tts_mutex.acquire()
         result = True
         channel = self.__osl_obj.tts.speak(text, self.tts._locutor, self.tts._pitch)
@@ -188,6 +198,8 @@
         return self.__osl_obj.tts.set_stop()
         
     def _tts_select_voice(self, locutor, pitch):
+        if (locutor == None) or (pitch == None):
+            return False
         self.tts._pitch = pitch
         if str(type(locutor)) != "<type 'str'>":
             locutor = SPK_NAME_LIST[locutor]

Modified: software/tuxosl/trunk/tux_osl_daemon.py
===================================================================
--- software/tuxosl/trunk/tux_osl_daemon.py	2008-03-06 14:26:44 UTC (rev 934)
+++ software/tuxosl/trunk/tux_osl_daemon.py	2008-03-06 14:27:14 UTC (rev 935)
@@ -28,6 +28,7 @@
 
 def start_service():
     osl_ss = TuxOSLServiceServer()
+    time.sleep(3)
     osl_ss.start()
     osl_ss.wait_stop()
     osl_ss.destroy()   

Modified: software/tuxosl/trunk/tux_osl_event_cmd_client.py
===================================================================
--- software/tuxosl/trunk/tux_osl_event_cmd_client.py	2008-03-06 14:26:44 UTC (rev 934)
+++ software/tuxosl/trunk/tux_osl_event_cmd_client.py	2008-03-06 14:27:14 UTC (rev 935)
@@ -26,6 +26,7 @@
 import sys
 import os
 import threading
+import socket
 
 from tux_osl_const import *
 from tux_osl_event_controler import EventsHandler
@@ -33,7 +34,20 @@
 EVENT_CLIENT_DEFAULT_PORT                           = 5510
 CMD_CLIENT_DEFAULT_PORT                             = 5511
 
+class TimeoutTransport(xmlrpclib.Transport):
 
+    def request(self, host, handler, request_body, verbose=0):
+        self.__handler = handler
+        try:
+            ret = xmlrpclib.Transport.request(self, host, '/RPC2',
+                                           request_body, verbose)
+        except socket.timeout:
+            ret = ""
+        except:
+            pass
+            #print sys.exc_info()
+        return ret
+
 class TuxOSLClientBase(object):
 
     def __init__(self):
@@ -91,7 +105,9 @@
         self.__port = port
         proxy = "http://%s:%d" % (self.__host, self.__port)
         try:
-            self.__server = xmlrpclib.Server(proxy)
+            t = TimeoutTransport()
+            t.timeout = 20
+            self.__server = xmlrpclib.Server(proxy, transport = t)
             self.__server.system.listMethods()
         except:
             # Error: Server not found
@@ -112,6 +128,8 @@
         def ac_async(host, port):
             while self.__get_auto_connect_flag():
                 if not self.get_connected():
+                    #os.system("/opt/tuxdroid/bin/tuxosld&")
+                    #time.sleep(1.0)
                     self.connect(host, port)
                 time.sleep(1.0)