Add the ability to examine obj/attr with wildcards.

apps/objects/models.py

@@ -1,3 +1,4 @@
+import re
 from django.db import models
 from django.contrib.auth.models import User, Group
 import defines_global
@@ -24,12 +25,43 @@ class Attribute(models.Model):
       list_display = ('object', 'name', 'value',)
       search_fields = ['name']
       
+   """
+   BEGIN COMMON METHODS
+   """
    def get_name(self):
       """
       Returns an attribute's name.
       """
       return self.name
       
+   def get_value(self):
+      """
+      Returns an attribute's value.
+      """
+      return self.value
+   
+   def get_object(self):
+      """
+      Returns the object that the attribute resides on.
+      """
+      return self.object
+      
+   def is_hidden(self):
+      """
+      Returns True if the attribute is hidden.
+      """
+      return self.is_hidden
+      
+   def get_attrline(self):
+      """
+      Best described as a __str__ method for in-game. Renders the attribute's
+      name and value as per MUX.
+      """
+      return "%s%s%s: %s" % (ansi.ansi["hilite"], 
+         self.get_name(), 
+         ansi.ansi["normal"], 
+         self.get_value())
+
 class Object(models.Model):
    """
    The Object class is very generic representation of a THING, PLAYER, EXIT,
@@ -384,6 +416,21 @@ class Object(models.Model):
       else:
          return True
          
+   def attribute_namesearch(self, searchstr):
+      """
+      Searches the object's attributes for name matches against searchstr
+      via regular expressions. Returns a list.
+      
+      searchstr: (str) A string (maybe with wildcards) to search for.
+      """
+      # Retrieve the list of attributes for this object.
+      attrs = Attribute.objects.filter(object=self)
+      # Compile a regular expression that is converted from the user's
+      # wild-carded search string.
+      match_exp = re.compile(functions_general.wildcard_to_regexp(searchstr), re.IGNORECASE)
+      # If the regular expression search returns a match object, add to results.
+      return [attr for attr in attrs if match_exp.search(attr.name)]
+      
    def has_flag(self, flag):
       """
       Does our object have a certain flag?

commands_general.py

@@ -178,11 +178,28 @@ def cmd_examine(cdat):
    session = cdat['session']
    pobject = session.get_pobject()
    args = cdat['uinput']['splitted'][1:]
+   attr_search = False
    
    if len(args) == 0:   
+      # If no arguments are provided, examine the invoker's location.
       target_obj = pobject.get_location()
    else:
-      results = functions_db.local_and_global_search(pobject, ' '.join(args))
+      # Look for a slash in the input, indicating an attribute search.
+      attr_split = args[0].split("/")
+      
+      # If the splitting by the "/" character returns a list with more than 1
+      # entry, it's an attribute match.
+      if len(attr_split) > 1:
+         attr_search = True
+         # Strip the object search string from the input with the
+         # object/attribute pair.
+         searchstr = attr_split[0]
+         # Just in case there's a slash in an attribute name.
+         attr_searchstr = '/'.join(attr_split[1:])
+      else:
+         searchstr = ' '.join(args)
+      
+      results = functions_db.local_and_global_search(pobject, searchstr)
       
       if len(results) > 1:
          session.msg("More than one match found (please narrow target):")
@@ -194,48 +211,58 @@ def cmd_examine(cdat):
          return
       else:
          target_obj = results[0]
-   session.msg("%s\r\n%s" % (
-      target_obj.get_name(fullname=True),
-      target_obj.get_description(no_parsing=True),
-   ))
-   session.msg("Type: %s Flags: %s" % (target_obj.get_type(), target_obj.get_flags()))
-   session.msg("Owner: %s " % (target_obj.get_owner(),))
-   session.msg("Zone: %s" % (target_obj.get_zone(),))
          
-   for attribute in target_obj.get_all_attributes():
+   if attr_search:
-      session.msg("%s%s%s: %s" % (ansi.ansi["hilite"], attribute.get_name(), ansi.ansi["normal"], attribute.value))
+      attr_matches = target_obj.attribute_namesearch(attr_searchstr)
-   
+      if attr_matches:
-   con_players = []
+         for attribute in attr_matches:
-   con_things = []
+            session.msg(attribute.get_attrline())
-   con_exits = []
-   
-   for obj in target_obj.get_contents():
-      if obj.is_player():
-         con_players.append(obj)  
-      elif obj.is_exit():
-         con_exits.append(obj)
-      elif obj.is_thing():
-         con_things.append(obj)
-   
-   if con_players or con_things:
-      session.msg("%sContents:%s" % (ansi.ansi["hilite"], ansi.ansi["normal"],))
-      for player in con_players:
-         session.msg('%s' % (player.get_name(fullname=True),))
-      for thing in con_things:
-         session.msg('%s' % (thing.get_name(fullname=True),))
-         
-   if con_exits:
-      session.msg("%sExits:%s" % (ansi.ansi["hilite"], ansi.ansi["normal"],))
-      for exit in con_exits:
-         session.msg('%s' %(exit.get_name(fullname=True),))
-         
-   if not target_obj.is_room():
-      if target_obj.is_exit():
-         session.msg("Destination: %s" % (target_obj.get_home(),))
       else:
-         session.msg("Home: %s" % (target_obj.get_home(),))
+         session.msg("No matching attributes found.")
+      # End attr_search if()
+   else:
+      session.msg("%s\r\n%s" % (
+         target_obj.get_name(fullname=True),
+         target_obj.get_description(no_parsing=True),
+      ))
+      session.msg("Type: %s Flags: %s" % (target_obj.get_type(), target_obj.get_flags()))
+      session.msg("Owner: %s " % (target_obj.get_owner(),))
+      session.msg("Zone: %s" % (target_obj.get_zone(),))
       
-      session.msg("Location: %s" % (target_obj.get_location(),))
+      for attribute in target_obj.get_all_attributes():
+         session.msg(attribute.get_attrline())
+      
+      con_players = []
+      con_things = []
+      con_exits = []
+      
+      for obj in target_obj.get_contents():
+         if obj.is_player():
+            con_players.append(obj)  
+         elif obj.is_exit():
+            con_exits.append(obj)
+         elif obj.is_thing():
+            con_things.append(obj)
+      
+      if con_players or con_things:
+         session.msg("%sContents:%s" % (ansi.ansi["hilite"], ansi.ansi["normal"],))
+         for player in con_players:
+            session.msg('%s' % (player.get_name(fullname=True),))
+         for thing in con_things:
+            session.msg('%s' % (thing.get_name(fullname=True),))
+            
+      if con_exits:
+         session.msg("%sExits:%s" % (ansi.ansi["hilite"], ansi.ansi["normal"],))
+         for exit in con_exits:
+            session.msg('%s' %(exit.get_name(fullname=True),))
+            
+      if not target_obj.is_room():
+         if target_obj.is_exit():
+            session.msg("Destination: %s" % (target_obj.get_home(),))
+         else:
+            session.msg("Home: %s" % (target_obj.get_home(),))
+            
+         session.msg("Location: %s" % (target_obj.get_location(),))
    
 def cmd_page(cdat):
    """