[Pybridge-commits] SF.net SVN: pybridge: [401] trunk/pybridge/pybridge/server

[<umg...@us...>]

Revision: 401
          http://svn.sourceforge.net/pybridge/?rev=401&view=rev
Author:   umgangee
Date:     2007-04-06 10:55:41 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
Update references to roster classes.

Modified Paths:
--------------
    trunk/pybridge/pybridge/server/server.py
    trunk/pybridge/pybridge/server/user.py

Modified: trunk/pybridge/pybridge/server/server.py
===================================================================
--- trunk/pybridge/pybridge/server/server.py	2007-04-06 17:54:58 UTC (rev 400)
+++ trunk/pybridge/pybridge/server/server.py	2007-04-06 17:55:41 UTC (rev 401)
@@ -23,34 +23,36 @@
 from pybridge import __version__
 
 from pybridge.network.error import DeniedRequest, IllegalRequest
+from pybridge.network.localtable import LocalTable
 from pybridge.network.tablemanager import LocalTableManager
 from pybridge.network.usermanager import LocalUserManager
 
-from pybridge.network.localtable import LocalTable
 from pybridge.bridge.game import BridgeGame
 
 
-class Server:
+class Server(object):
 
 
     def __init__(self):
+        # Set up rosters.
         self.tables = LocalTableManager()
         self.users = LocalUserManager()
+
         self.version = __version__
         self.supported = ['bridge']
 
 
     def userConnects(self, user):
         """"""
-        self.users.userLoggedIn(user)
+        log.msg("User %s connected" % user.name)
+        self.users.userLogin(user)
         db.UserAccount.byUsername(user.name).set(lastLogin=datetime.now())
-        log.msg("User %s connected" % user.name)
 
 
     def userDisconnects(self, user):
         """"""
-        self.users.userLoggedOut(user)
         log.msg("User %s disconnected" % user.name)
+        self.users.userLogout(user)
 
 
 # Methods invoked by user perspectives.
@@ -85,4 +87,5 @@
             table.id = tableid
             table.server = self
             self.tables.openTable(table)
+            #self.tables[tableid] = table
 

Modified: trunk/pybridge/pybridge/server/user.py
===================================================================
--- trunk/pybridge/pybridge/server/user.py	2007-04-06 17:54:58 UTC (rev 400)
+++ trunk/pybridge/pybridge/server/user.py	2007-04-06 17:55:41 UTC (rev 401)
@@ -26,7 +26,9 @@
 
 class User(pb.Avatar):
 
+    info = property(lambda self: {})
 
+
     def __init__(self, name):
         self.name = name  # User name.
         self.server = None  # Set by Realm.
@@ -62,16 +64,16 @@
         return info
 
 
-    def perspective_getTables(self):
-        """Provides RemoteTableManager to the client."""
-        return self.server.tables
+    def perspective_getRoster(self, name):
+        """Provides roster requested by client."""
+        if name == 'tables':
+            return self.server.tables
+        elif name == 'users':
+            return self.server.users
+        else:
+            raise DeniedRequest, "Unknown roster name \'%s\'" % name
 
 
-    def perspective_getUsers(self):
-        """Provides RemoteUserManager to the client."""
-        return self.server.users
-
-
     def perspective_hostTable(self, tableid, tabletype):
         """Creates a new table."""
         if not isinstance(tableid, str):


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