Changeset 45 for tabled.tac

Timestamp:

02/08/08 19:24:35 (4 years ago)

Author:

mike

Message:

Got ucommet working

Files:

• tabled.tac (modified) (5 diffs)

tabled.tac

@@ -1 +1 @@
 """
 """
-import sys
-from random import randint
 from holdemtable import holdemtable
 import protocol
-import getopt
-#import cjson
 import simplejson
 from twisted.internet.protocol import Factory
-from twisted.internet import reactor
 from twisted.protocols.basic import NetstringReceiver
 from twisted.internet import defer
-from twisted.application import internet, service, strports
-from twisted.web2 import http, resource, channel, stream, server, static, http_headers, responsecode
+from twisted.application import internet, service
+from twisted.web2 import http, resource, channel, server, static
 from path import path
-import cometd
-
-
-encodejson = simplejson.dumps
-decodejson = simplejson.loads
+import ucomet
+from ucomet import encodejson,decodejson
+
+
 tables = {}
 class BasePokerTableHandler:
@@ -85 +79 @@
 clientChannels = [ r"\/poker" ]
 
-class PokerSubscription(cometd.ClientSubscription,BasePokerTableHandler):
-    def __init__(self, channel):
+class PokerSubscription(ucomet.ClientSubscription, BasePokerTableHandler):
+    def __init__(self, channel, sendMessageCallback):
         BasePokerTableHandler.__init__(self)
-        cometd.ClientSubscription.__init__(self, channel)
+        ucomet.ClientSubscription.__init__(self, channel, sendMessageCallback)
 
     def messageReceived(self,message):
@@ -95 +89 @@
     def sendMessageViaTransport(self,data):
         self.sendMessage(data)
-
-class WebClient(cometd.Client):
-    
-    def generateSubscription(self, channel):
-        return PokerSubscription( channel )
-
-    def subscribe(self, channel):
-        #we only want poker channels
-        print "SUB ---------------- CHAN " + channel
-        if channel == "/poker":
-            return cometd.Client.subscribe(self,channel)
-        else: return False
-
 
 
@@ -194 +175 @@
 
 """
-#cometd.verbose = False
 class CometdRunner(resource.Resource):
-    # blah, hacky class. Wish we didn't need it
     addSlash = True
     child_web = static.File(path("web").abspath())
-    child_cometd = cometd.cometd()
-    child_cometd.ClientType = WebClient
-    #child_cometd
+    child_cometd = ucomet.ucomet()
+#    child_cometd.ClientType = WebClient
+    child_cometd.ClientSubscriptionType = PokerSubscription
     def render(self, ctx):
         return http.Response( stream="hi")
@@ -227 +206 @@
 print "Listening on localhost:%d(tcp) %d(http)" % (port, port2)
 
-# vim:filetype=python
+