Changeset 11

Timestamp:

02/03/08 12:16:12 (11 months ago)

Author:

mike

Message:

Started on client

Files:

• client.py (added)
• tabled.py (modified) (5 diffs)

tabled.py

@@ -21 +21 @@
 
     def sendMessage(self, data):
-        self.transport.write( cjson.encode(
+        self.sendString( cjson.encode(
             data) )
         d = defer.Deferred()
@@ -28 +28 @@
 
 
-    def dataReceived(self, data):
+    def stringReceived(self, line):
         
         try:
-            decoded = cjson.decode(data)
+            decoded = cjson.decode(line)
             if "method" not in decoded:
-                self.transport.write( cjson.encode(
+                self.sendString( cjson.encode(
                     protocol.MakeError(101,"Messages must contain methods")) )
                 return
@@ -39 +39 @@
             if method == "connect":
                 if self.table or self.id:
-                    self.transport.write( cjson.encode(
+                    self.sendString( cjson.encode(
                         protocol.MakeError(103,"Already connected")) )
                     return
@@ -45 +45 @@
                 self.table = tables[decoded["table_name"]]
                 if self.table.isFull():
-                    self.transport.write( cjson.encode(
+                    self.sendString( cjson.encode(
                         protocol.MakeError(104,"Table is full")))
                     return
@@ -54 +54 @@
                     self.table.addPlayer(decoded, d)
             else:
-                self.transport.write( cjson.encode(protocol.MakeError(102,"Unknown Method")) )
+                self.sendString( cjson.encode(protocol.MakeError(102,"Unknown Method")) )
             print method
         except cjson.DecodeError:
-            self.transport.write( cjson.encode(protocol.MakeError( 100, "Message must be in JSON")) )
-            print data
+            self.sendString( cjson.encode(protocol.MakeError( 100, "Message must be in JSON")) )
+            print line
             return