Changeset 27 for tabled.py

Timestamp:

02/05/08 19:00:53 (4 years ago)

Author:

mike

Message:

Added async stuff

Files:

• tabled.py (modified) (5 diffs)

tabled.py

@@ -25 +25 @@
     
     def sendMessage(self, data):
-        try:
-            self.sendMessageViaTransport( encodejson(data) )
-        except cjson.EncodeError,e:
-            print data
-            print e
+        self.sendMessageViaTransport( data )
         d = defer.Deferred()
         d.addCallback(self.sendMessage)
@@ -68 +64 @@
             elif method == "action":
                 value =  decoded["value"]
+                if value == "null": value = None
                 if value != None: value = float(value)
                 self.table.action(self.id, decoded["action"],value)
@@ -81 +78 @@
 
 class PokerTableProtocol(NetstringReceiver,BasePokerTableHandler):
-    sendMessageViaTransport = NetstringReceiver.sendString
+
+    def sendMessageViaTransport(self,data):
+        NetstringReceiver.sendString(self, encodejson(data))
+        
 
     def stringReceived(self, line):
@@ -97 +97 @@
     def __init__(self):
         BasePokerTableHandler.__init__(self)
-        self.__waitingRequest=None
+        #request consists of (jsoncallback,deferred)
+        self.__waitingRequest=[]
         self.__messageQueue=[]
-        self.jsoncallback = None
 
     def sendMessageViaTransport(self, data):
@@ -113 +113 @@
 
     def checkWaiting(self):
-        if self.__waitingRequest != None and len(self.__messageQueue) > 0:
+        if len(self.__waitingRequest) > 0 and len(self.__messageQueue) > 0:
             print "SENDING RESPONSE TO HTTP"
-            self.__waitingRequest.callback(self.__messageQueue.pop(0))
-            self.__waitingRequest = None
+            d = self.__waitingRequest.pop(0)
+            d[1].callback((self.__messageQueue, d[0]))
+            self.__messageQueue = []
 
-    def __doResponse(self,resp):
+    def __doResponse(self,dat):
+        resp,jsoncallback = dat
         return http.Response(stream=
-                str("%s(%s)" % (self.jsoncallback,resp)),
+                str("%s(%s)" % (jsoncallback,encodejson(resp))),
                 headers = {"content-type": MimeType.fromString("text/javascript")})
 
     def doRenderStuff(self,nargs):
         if "jsoncallback" in nargs:
-            self.jsoncallback = nargs["jsoncallback"]
-            print "json callback set to %s" % self.jsoncallback
+            jsoncallback = nargs["jsoncallback"]
 
         d = defer.Deferred()
         #yeah, i know we're going to unparse
         d.addCallback( self.__doResponse )
-        if self.__waitingRequest != None:
-            print "WE ALREADY HAVE A REQUEST,WTF"
         print "ADDING REQUEST"
-        self.__waitingRequest = d
+        self.__waitingRequest.append( (jsoncallback, d) )
 
         if "method" in nargs and not nargs["method"] == "get_update":
-           self.dataRecieved(encodejson(nargs))
+            self.dataRecieved(encodejson(nargs))
+
+        self.checkWaiting()