Added more caching to channelhandler as well as players in order to cut back on unnecessary database calls.

src/comms/channelhandler.py

@@ -10,7 +10,7 @@ to just write
 For this to work, 'newbie', the name of the channel, must
 be identified by the cmdhandler as a command name. The
 channelhandler stores all channels as custom 'commands'
-that the cmdhandler can import and look through. 
+that the cmdhandler can import and look through.
 
 Warning - channel names take precedence over command names,
 so make sure to not pick clashing channel names.
@@ -20,7 +20,7 @@ the channelhandler at all - the create_channel method handles the update.
 
 To delete a channel cleanly, delete the channel object, then call
 update() on the channelhandler. Or use Channel.objects.delete() which
-does this for you. 
+does this for you.
 
 """
 from src.comms.models import Channel, Msg
@@ -32,7 +32,7 @@ class ChannelCommand(command.Command):
     Channel
 
     Usage:
-       <channel name or alias>  <message> 
+       <channel name or alias>  <message>
 
     This is a channel. If you have subscribed to it, you can send to
     it by entering its name or alias, followed by the text you want to
@@ -41,12 +41,12 @@ class ChannelCommand(command.Command):
     # this flag is what identifies this cmd as a channel cmd
     # and branches off to the system send-to-channel command
     # (which is customizable by admin)
-    is_channel = True 
+    is_channel = True
     key = "general"
     help_category = "Channel Names"
     locks = "cmd:all()"
-    obj = None     
-    
+    obj = None
+
     def parse(self):
         """
         Simple parser
@@ -63,12 +63,12 @@ class ChannelCommand(command.Command):
         caller = self.caller
         if not msg:
             caller.msg("Say what?")
-            return 
+            return
         channel = Channel.objects.get_channel(channelkey)
 
         if not channel:
             caller.msg("Channel '%s' not found." % channelkey)
-            return 
+            return
         if not channel.has_connection(caller):
             string = "You are not connected to channel '%s'."
             caller.msg(string % channelkey)
@@ -77,9 +77,9 @@ class ChannelCommand(command.Command):
             string = "You are not permitted to send to channel '%s'."
             caller.msg(string % channelkey)
             return
-        msg = "[%s] %s: %s" % (channel.key, caller.name, msg)        
+        msg = "[%s] %s: %s" % (channel.key, caller.name, msg)
         # we can't use the utils.create function to make the Msg,
-        # since that creates an import recursive loop.         
+        # since that creates an import recursive loop.
         try:
             sender = caller.player
         except AttributeError:
@@ -88,19 +88,20 @@ class ChannelCommand(command.Command):
         msgobj = Msg(db_sender=sender, db_message=msg)
         msgobj.save()
         msgobj.channels = channel
-        # send new message object to channel        
+        # send new message object to channel
         channel.msg(msgobj, from_obj=sender)
 
 class ChannelHandler(object):
     """
     Handles the set of commands related to channels.
     """
-    def __init__(self):        
+    def __init__(self):
         self.cached_channel_cmds = []
+        self.cached_cmdsets = {}
 
     def __str__(self):
         return ", ".join(str(cmd) for cmd in self.cached_channel_cmds)
-    
+
     def clear(self):
         """
         Reset the cache storage.
@@ -114,57 +115,61 @@ class ChannelHandler(object):
         if not utils.is_iter(aliases):
             aliases = [aliases]
         ustring = "%s <message>" % key.lower() + "".join(["\n           %s <message>" % alias.lower() for alias in aliases])
-        desc = channel.desc        
+        desc = channel.desc
         string = \
         """
-        Channel '%s' 
+        Channel '%s'
 
         Usage (not including your personal aliases):
            %s
 
         %s
         """ % (key, ustring, desc)
-        return string 
-         
+        return string
+
     def add_channel(self, channel):
         """
         Add an individual channel to the handler. This should be
         called whenever a new channel is created. To
         remove a channel, simply delete the channel object
-        and run self.update on the handler. 
+        and run self.update on the handler.
         """
         # map the channel to a searchable command
         cmd = ChannelCommand()
         cmd.key = channel.key.strip().lower()
         cmd.obj = channel
         cmd.__doc__= self._format_help(channel)
-        if channel.aliases: 
+        if channel.aliases:
             cmd.aliases = channel.aliases
         cmd.lock_storage = "cmd:all();%s" % channel.locks
         cmd.lockhandler.reset()
-
         self.cached_channel_cmds.append(cmd)
+        self.cached_cmdsets = {}
 
     def update(self):
         "Updates the handler completely."
         self.cached_channel_cmds = []
+        self.cached_cmdsets = {}
         for channel in Channel.objects.all():
             self.add_channel(channel)
 
     def get_cmdset(self, source_object):
         """
         Retrieve cmdset for channels this source_object has
-        access to send to. 
+        access to send to.
         """
-        # create a temporary cmdset holding all channels 
-        chan_cmdset = cmdset.CmdSet()
-        chan_cmdset.key = '_channelset'
-        chan_cmdset.priority = 10
-        chan_cmdset.duplicates = True 
-
-        for cmd in [cmd for cmd in self.cached_channel_cmds            
-                    if cmd.access(source_object, 'listen')]:
-            chan_cmdset.add(cmd)
-        return chan_cmdset
+        if source_object in self.cached_cmdsets:
+            return self.cached_cmdsets[source_object]
+        else:
+            # create a new cmdset holding all channels
+            chan_cmdset = cmdset.CmdSet()
+            chan_cmdset.key = '_channelset'
+            chan_cmdset.priority = 10
+            chan_cmdset.duplicates = True
+            for cmd in [cmd for cmd in self.cached_channel_cmds
+                        if cmd.access(source_object, 'send')]:
+                chan_cmdset.add(cmd)
+            self.cached_cmdsets[source_object] = chan_cmdset
+            return chan_cmdset
 
 CHANNELHANDLER = ChannelHandler()