Thread: [Pybridge-commits] SF.net SVN: pybridge: [391] trunk/pybridge/pybridge/network/client.py

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 391
          http://svn.sourceforge.net/pybridge/?rev=391&view=rev
Author:   umgangee
Date:     2007-04-03 04:39:46 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Add ISubject (observer) facility to NetworkClient.

Modified Paths:
--------------
    trunk/pybridge/pybridge/network/client.py

Modified: trunk/pybridge/pybridge/network/client.py
===================================================================

--- trunk/pybridge/pybridge/network/client.py	2007-04-03 11:36:47 UTC (rev 390)
+++ trunk/pybridge/pybridge/network/client.py	2007-04-03 11:39:46 UTC (rev 391)
@@ -20,11 +20,14 @@
 from twisted.cred import credentials
 from twisted.internet import reactor
 from twisted.spread import pb
+from zope.interface import implements
 
-from pybridge.network.localbridge import LocalBridgeTable
-from pybridge.network.remotebridge import RemoteBridgeTable
-pb.setUnjellyableForClass(LocalBridgeTable, RemoteBridgeTable)
+from pybridge.interfaces.observer import ISubject
 
+from pybridge.network.localtable import LocalTable
+from pybridge.network.remotetable import RemoteTable
+pb.setUnjellyableForClass(LocalTable, RemoteTable)
+
 from pybridge.network.tablemanager import LocalTableManager, RemoteTableManager
 pb.setUnjellyableForClass(LocalTableManager, RemoteTableManager)
 
@@ -35,21 +38,49 @@
 class NetworkClient(pb.Referenceable):
     """Provides the glue between the client code and the server."""
 
+    implements(ISubject)
 
+
     def __init__(self):
+        self.listeners = []
+
         self.avatar = None  # Remote avatar reference.
         self.factory = pb.PBClientFactory()
-        self.eventHandler = None
-        
+        self.factory.clientConnectionLost = self.connectionLost
+
         self.username = None
         self.tables = {}  # Tables observed.
         self.tablesAvailable = None
         self.usersOnline = None
 
 
+    def connectionLost(self, connector, reason):
+        print "Connection lost:", reason.getErrorMessage()
+        self.notify('connectionLost', message=reason.getErrorMessage())
+
+
+# Implementation of ISubject.
+
+
+    def attach(self, listener):
+        self.listeners.append(listener)
+
+
+    def detach(self, listener):
+        self.listeners.remove(listener)
+
+
+    def notify(self, event, *args, **kwargs):
+        for listener in self.listeners:
+            listener.update(event, *args, **kwargs)
+
+
+# Methods
+
+
     def setEventHandler(self, handler):
+        print "REMOVE THIS"
         self.eventHandler = handler
-        self.factory.clientConnectionLost = handler.connectionLost
 
 
     def connect(self, hostname, port):
@@ -66,6 +97,7 @@
         self.factory.disconnect()
         self.avatar = None
         self.username = None
+        self.notify('disconnect')
 
 
     def login(self, username, password):
@@ -94,6 +126,7 @@
             """Actions to perform when connection succeeds."""
             self.avatar = avatar
             self.username = username
+            self.notify('connect')
             avatar.callRemote('getTables').addCallback(gotTables)
             avatar.callRemote('getUsers').addCallback(gotUsers)
         
@@ -112,6 +145,7 @@
             """Register user account on server."""
             hash = sha.new(password).hexdigest()
             d = avatar.callRemote('register', username, hash)
+            print "TODO: after registration, need to disconnect from server"
             return d
         
         anon = credentials.UsernamePassword('', '')
@@ -126,11 +160,10 @@
 
     def joinTable(self, tableid, host=False):
         
-        def success(args):
-            table, remote = args  # RemoteBridgeTable, RemoteReference.
-            table.master = remote  # Set RemoteReference.
-            table.setEventHandler(self.eventHandler)
+        def success((table, remote)):
+            table.master = remote  # Set RemoteReference for RemoteBridgeTable.
             self.tables[tableid] = table
+            self.notify('joinTable', tableid=tableid, table=table)
             return table
         
         if host:
@@ -146,6 +179,7 @@
         
         def success(r):
             del self.tables[tableid]
+            self.notify('leaveTable', tableid=tableid)
         
         d = self.avatar.callRemote('leaveTable', tableid=tableid)
         d.addCallback(success)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Pybridge-commits] SF.net SVN: pybridge: [391] trunk/pybridge/pybridge/network/client.py

pybridge-commits