Changeset 49 for remote_control

Timestamp:

06/16/10 14:33:43 (11 years ago)

Author:

sc

Message:

client_thinkgear:

• minor cleanup
• authentication process not functioning

File:

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

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -35 +35 @@
 AUTHORIZATION_REQUEST = configuration.THINKGEAR_AUTHORIZATION_REQUEST
 
+PARAMETERS = {"enableRawOutput": False, "format": "Json"}
+
 #####################################################################
 # Classes
 #####################################################################
 
+class puzzlebox_brainstorms_client_thinkgear(client.puzzlebox_brainstorms_client):
+        
+        def __init__(self, log, \
+                          authorization_request, \
+                          server_host=SERVER_HOST, \
+                          server_port=SERVER_PORT, \
+                          DEBUG=DEBUG):
+                
+                self.log = log
+                self.DEBUG=DEBUG
+                
+                self.authorization_request = authorization_request
+                self.server_host = server_host
+                self.server_port = server_port
+                self.max_connection_attempts = MAX_CONNECTION_ATTEMPTS
+        
+        
+        ##################################################################
+        
+        def send_command_and_print_response(self, command):
+
+                if self.DEBUG:
+                        print "---> [Client] Sending:",
+                        print command
+
+                        
+                d = self.send_command(command)
+                d.addCallback(self.print_response)
+        
+        
+        ##################################################################
+        
+        def print_response(self, response):
+                
+                if self.DEBUG:
+                        print "---> [Client] Server Response:",
+                        print response
+
+                reactor.stop()
+        
 
 #####################################################################
@@ -49 +91 @@
         log = None
         
-        command_parameters = AUTHORIZATION_REQUEST
+        #authorization_request = AUTHORIZATION_REQUEST
+        authorization_request = None # Sending JSON not working
         
         #log.info("Command parameters: %s" % command_parameters)
-        
-        thinkgear_client = client.puzzlebox_brainstorms_client_command_line( \
+
+        thinkgear_client = puzzlebox_brainstorms_client_thinkgear( \
                     log, \
-                    command_parameters, \
+                    authorization_request, \
                     server_host=SERVER_HOST, \
                     server_port=SERVER_PORT, \
                     DEBUG=DEBUG)
-        
-        reactor.callWhenRunning(thinkgear_client.execute_command_line)
+
+        reactor.callWhenRunning( \
+                thinkgear_client.send_command_and_print_response, \
+                        thinkgear_client.authorization_request)
+
+
         reactor.run()