Changeset 50 for remote_control/puzzlebox_brainstorms_client_thinkgear.py

Timestamp:

06/16/10 22:09:46 (11 years ago)

Author:

sc

Message:

client_thinkgear:

• lineReceived based protocol class fixes communication overruns

File:

• remote_control/puzzlebox_brainstorms_client_thinkgear.py (modified) (6 diffs)

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -17 +17 @@
 
 from twisted.internet import reactor, protocol, defer
+from twisted.protocols import basic
 
 import puzzlebox_brainstorms_configuration as configuration
@@ -33 +34 @@
 NO_REPLY_WAIT = configuration.NO_REPLY_WAIT
 
+
 AUTHORIZATION_REQUEST = configuration.THINKGEAR_AUTHORIZATION_REQUEST
 
-PARAMETERS = {"enableRawOutput": False, "format": "Json"}
+THINKGEAR_PARAMETERS = {"enableRawOutput": False, "format": "Json"}
+#THINKGEAR_PARAMETERS = {"enableRawOutput": True, "format": "Json"}
 
 #####################################################################
@@ -56 +59 @@
                 self.server_port = server_port
                 self.max_connection_attempts = MAX_CONNECTION_ATTEMPTS
+
+        
+        ##################################################################
+        
+        def send_command(self, \
+                         command, \
+                         max_connection_attempts=MAX_CONNECTION_ATTEMPTS):
+                
+                factory = puzzlebox_brainstorms_client_thinkgear_factory(self.log, \
+                                                       command, \
+                                                       self.server_host, \
+                                                       self.server_port, \
+                                                       max_connection_attempts, \
+                                                       self.DEBUG)
+                
+                reactor.connectTCP(self.server_host, self.server_port, factory)
+                
+                return factory.replyDefer
         
         
@@ -78 +99 @@
                         print "---> [Client] Server Response:",
                         print response
-
-                reactor.stop()
-        
+                
+
+#####################################################################
+# ThinkGear Client Protocol class
+#####################################################################
+
+class puzzlebox_brainstorms_client_thinkgear_protocol( \
+        basic.LineReceiver):
+
+        delimiter='\r'
+        
+##      def __init__(self):
+##              
+##              self.DEBUG = DEBUG
+        
+        
+        ##################################################################
+        
+##      def connectionMade(self):
+##              
+##              #data = pickle.dumps(self.factory.command)
+##              data = json.dumps(self.factory.command)
+##              self.transport.write(data)
+##              
+##              self.factory.noReply = reactor.callLater(NO_REPLY_WAIT, self.noReply)
+        
+        
+        ##################################################################
+        
+##      def noReply(self):
+##              
+##              try:
+##                      self.factory.replyDefer.callback('NO_REPLY')
+##              except:
+##                      if self.DEBUG:
+##                              print "noReply failed to call callback"
+##                      #self.factory.log.error("noReply failed to call callback")
+##              
+##              self.transport.loseConnection()
+        
+        
+        ##################################################################
+
+        def lineReceived(self, line):
+
+                # Ignore blank lines
+                if not line:
+                        return
+                
+
+                data = json.loads(line)
+                print "data:",
+                print data
+
+
+#####################################################################
+# ThinkGear Client Factory class
+#####################################################################
+
+class puzzlebox_brainstorms_client_thinkgear_factory( \
+        client.puzzlebox_brainstorms_client_send_command_factory):
+        
+        def __init__(self, log, \
+                     command, \
+                     server_host=SERVER_HOST, \
+                     server_port=SERVER_PORT, \
+                     max_connection_attempts=MAX_CONNECTION_ATTEMPTS, \
+                     DEBUG=DEBUG):
+                
+                self.log = log
+                self.DEBUG = DEBUG
+                self.server_host = server_host
+                self.server_port = server_port
+                self.command = command
+                
+                self.max_connection_attempts = max_connection_attempts
+                self.connection_attempt = 1
+                
+                self.protocol = \
+                   puzzlebox_brainstorms_client_thinkgear_protocol
+                
+                self.replyDefer = defer.Deferred()
+
 
 #####################################################################
@@ -92 +193 @@
         
         #authorization_request = AUTHORIZATION_REQUEST
-        authorization_request = None # Sending JSON not working
+        authorization_request = None # ThinkGear authentication not working
+        thinkgear_parameters = THINKGEAR_PARAMETERS
         
         #log.info("Command parameters: %s" % command_parameters)
@@ -105 +207 @@
         reactor.callWhenRunning( \
                 thinkgear_client.send_command_and_print_response, \
-                        thinkgear_client.authorization_request)
+                        thinkgear_parameters)