Changeset 54 for remote_control

Timestamp:

06/18/10 15:42:59 (11 years ago)

Author:

sc

Message:

client_thinkgear:

• general cleanup

server_thinkgear:

• structure in place for packet updating

server:

• comment cleanup

Location:

remote_control

Files:

• puzzlebox_brainstorms_client_thinkgear.py (modified) (6 diffs)
• puzzlebox_brainstorms_server.py (modified) (1 diff)
• puzzlebox_brainstorms_server_thinkgear.py (modified) (12 diffs)

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -77 +77 @@
                 reactor.connectTCP(self.server_host, self.server_port, factory)
                 
-                return factory.replyDefer
+##              return factory.replyDefer
         
         
@@ -90 +90 @@
                         
                 d = self.send_command(command)
-                d.addCallback(self.print_response)
+                #d.addCallback(self.print_response)
         
         
@@ -135 +135 @@
                         if self.DEBUG:
                                 print "noReply failed to call callback"
-                        #self.factory.log.error("noReply failed to call callback")
-                
-##              self.transport.loseConnection()
         
         
@@ -169 +166 @@
                                 print data
 
-##                self.factory.send_command_and_print_response(data)
-
 
         ##################################################################
@@ -178 +173 @@
                 if self.DEBUG > 1:
                         print "Connection lost:",
+                        print reason
+
+
+        ##################################################################
+
+        def connectionDone(self, reason):
+
+                if self.DEBUG > 1:
+                        print "Connection done:",
                         print reason
 
@@ -233 +237 @@
 
         reactor.callWhenRunning( \
-                thinkgear_client.send_command_and_print_response, \
+                thinkgear_client.send_command, \
                         thinkgear_parameters)
 

remote_control/puzzlebox_brainstorms_server.py

@@ -20 +20 @@
 
 import puzzlebox_brainstorms_configuration as configuration
-#import puzzlebox_brainstorms_client
 import puzzlebox_brainstorms_remote_control as remote_control
 #import puzzlebox_logger

remote_control/puzzlebox_brainstorms_server_thinkgear.py

@@ -20 +20 @@
 
 import puzzlebox_brainstorms_configuration as configuration
-#import puzzlebox_brainstorms_client
 #import puzzlebox_logger
 
@@ -95 +94 @@
                 
                 self.protocol = puzzlebox_brainstorms_server_protocol
+
+                self.status_packet = DEFAULT_PACKET
+                self.client_connected = False
         
         
@@ -103 +105 @@
                 d = defer.Deferred()
                 
-##              response = '%s command received' % data
-
                 response = DEFAULT_RESPONSE_MESSAGE
                 
@@ -111 +111 @@
                         print data
                 
-                
-##              if DISCRETE_CONTROL_COMMANDS:
-##                      
-##                      self.execute_command(command)
-                
-                
                 if response:
                         d.callback(response)
                 
-                
                 return d
         
@@ -126 +119 @@
         ##################################################################
         
-##      def execute_command(self, command):
-##              
-##              #command_line = 'python puzzlebox_brainstorms_remote_control.py --command=%s' % command
-##              
-##              #os.system(command_line)
-##              
-##              rc = remote_control.puzzlebox_brainstorms_rc( \
-##                      device=configuration.BLUETOOTH_DEVICE, \
-##                      command=command, \
-##                      DEBUG=DEBUG)
-##              
-##              if rc.connection != None:
-##                      rc.run(rc.command)
-##                      rc.stop()
-        
-        
-        ##################################################################
-        
-        def process_connection_lost(self, data):
-                
-                if not data:
-                        
-                        #self.log.debug("Connection lost with no data")
-                        
-                        if self.DEBUG:
-                                print "--> [ThinkGear Emulator] Connection lost with no data"
-                
-                
-                else:
-                        
-                        #self.log.debug("Connection lost")
-                        
-                        #if self.DEBUG:
-                                #print "--> [Server] Connection lost"
-                        
-                        pass
-
-
-        ##################################################################
-
-        def send_packet(self):
-
-##              print dir(self.protocol)
-##              print self.protocol.connected
-##              if self.protocol.transport != None:
-##                      data = json.dumps(DEFAULT_SIGNAL_LEVEL_MESSAGE)
-##                      self.transport.write(data)
-
-                pass
-
-
-        ##################################################################
-
-        def start(self):
-
-                self.looping_timer = task.LoopingCall(self.send_packet)
+        def process_connection_lost(self):
+                
+                print "--> [ThinkGear Emulator] Connection lost"
+                self.client_connected = False
+
+
+        ##################################################################
+
+        def update_status(self):
+
+                if self.DEBUG > 1:
+                        print "status:",
+                        print self.status_packet
+                
+
+        ##################################################################
+
+        def start_updating(self):
+
+                self.client_connected = True
+                self.looping_timer = task.LoopingCall(self.update_status)
                 self.looping_timer.start(MESSAGE_FREQUENCY_TIMER)
 
@@ -204 +162 @@
         def connectionMade(self):
                 
-##              data = json.dumps(self.factory.command)
-##              self.transport.write(data)
-##              
-##              self.factory.noReply = reactor.callLater(NO_REPLY_WAIT, self.noReply)
-
-
                 if self.DEBUG:
-                        print "connectionMade"
-
-
-                response = DEFAULT_RESPONSE_MESSAGE
-
-
-                if self.DEBUG:
-                        print "--> [ThinkGear Emulator] Sending:",
-                        print response
-                        
-                response = json.dumps(response)
-##              self.transport.write(response)
-                self.sendLine(response)
+                        print "--> [ThinkGear Emulator] Client connected"
+                        
+                self.factory.start_updating()
+
 
         ##################################################################
@@ -234 +177 @@
                         if self.DEBUG:
                                 print "noReply failed to call callback"
-                        #self.factory.log.error("noReply failed to call callback")
                 
                 self.transport.loseConnection()
@@ -260 +202 @@
         
         def dataReceived(self, data):
-
-##              if self.DEBUG:
-##                      print "data received:",
-##                      print data
                 
                 self.data_chunk += data
@@ -271 +209 @@
                 
                 except Exception, e:
-##                      self.factory.log.error("Partial data received (or error:",
-##                                             e, ").")
                         if DEBUG:
                                 print "Partial data received (or error:",
@@ -289 +225 @@
         def send_response(self, response):
 
-                if self.DEBUG:
-                        print "--> [ThinkGear Emulator] Sending:",
-                        print response
+                if self.factory.client_connected:
+                        if self.DEBUG:
+                                print "--> [ThinkGear Emulator] Sending:",
+                                print response
                         
                 response = json.dumps(response)
-##              self.transport.write(response)
                 self.sendLine(response)
 
-##              reactor.callLater(MESSAGE_FREQUENCY_TIMER, self.send_response, DEFAULT_RESPONSE_MESSAGE)
-                reactor.callLater(MESSAGE_FREQUENCY_TIMER, self.send_response, DEFAULT_PACKET)
+                reactor.callLater(MESSAGE_FREQUENCY_TIMER, \
+                                  self.send_response, \
+                                  self.factory.status_packet)
 
         
@@ -306 +243 @@
         def connectionLost(self, reason):
                 
-                self.factory.process_connection_lost(self.data)
+                self.factory.process_connection_lost()
 
 
@@ -339 +276 @@
                           port=server_port, \
                           factory=thinkgear_server)
-        reactor.callWhenRunning(reactor.callLater, 0, thinkgear_server.start)
         reactor.run()