From 4641aa8a4e1358b464f671e497aa2006c7b5192e Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Tue, 2 Jan 2007 04:19:53 +0000
Subject: [PATCH] Some more @list work and help system cleanup.

---
 evennia/trunk/apps/helpsys/models.py |   6 +++---
 evennia/trunk/commands_general.py    |   2 +-
 evennia/trunk/commands_staff.py      |  20 +++++++++++++++++---
 evennia/trunk/defines_global.py      |   4 ++--
 evennia/trunk/evennia.sql            | Bin 48128 -> 52224 bytes
 evennia/trunk/server.py              |   1 +
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/evennia/trunk/apps/helpsys/models.py b/evennia/trunk/apps/helpsys/models.py
index ccf92f94d7..010ba21254 100644
--- a/evennia/trunk/apps/helpsys/models.py
+++ b/evennia/trunk/apps/helpsys/models.py
@@ -11,7 +11,7 @@ class HelpEntry(models.Model):
    staff_only = models.BooleanField(default=0)
 
    class Admin:
-      list_display = ('topicname', 'staff_only')
+      list_display = ('id', 'topicname', 'staff_only')
       list_filter = ('staff_only',)
       search_fields = ['entrytext']
       
@@ -20,8 +20,8 @@ class HelpEntry(models.Model):
       ordering = ['topicname']
       
    def __str__(self):
-      return "%3d. %s" % (self.id, self.topicname)
-
+      return self.topicname
+      
    def get_topicname(self):
       """
       Returns the topic's name.
diff --git a/evennia/trunk/commands_general.py b/evennia/trunk/commands_general.py
index ef38c1b257..0174a83ce1 100644
--- a/evennia/trunk/commands_general.py
+++ b/evennia/trunk/commands_general.py
@@ -245,7 +245,7 @@ def cmd_help(cdat):
    elif len(topics) > 1:
       session.msg("More than one match found:")
       for result in topics:
-         session.msg(" %s" % (result,))
+         session.msg("%3d. %s" % (result.id, result.get_topicname()))
       session.msg("You may type 'help <#>' to see any of these topics.")
    else:   
       topic = topics[0]
diff --git a/evennia/trunk/commands_staff.py b/evennia/trunk/commands_staff.py
index 52f362dc01..2d2a60935f 100644
--- a/evennia/trunk/commands_staff.py
+++ b/evennia/trunk/commands_staff.py
@@ -8,6 +8,7 @@ import commands_unloggedin
 import cmdhandler
 import session_mgr
 import ansi
+import defines_global
 from django.contrib.auth.models import User
 from apps.objects.models import Object
 """
@@ -76,15 +77,28 @@ def cmd_list(cdat):
    args = cdat['uinput']['splitted'][1:]
    argstr = ''.join(args)
    
+   msg_invalid = "Unknown option. Use one of: commands, process"
+   
    if len(argstr) == 0:   
-      session.msg("Unknown option. Use one of: commands, process")
+      session.msg(msg_invalid)
    elif argstr == "commands":
       session.msg('Commands: '+' '.join(functions_general.command_list()))
    elif argstr == "process":
       loadvg = os.getloadavg()
+      psize = resource.getpagesize()
       rusage = resource.getrusage(resource.RUSAGE_SELF)
-      session.msg("Process ID: %d" % (os.getpid(),))
-      session.msg("Time used:   %d user   %d sys" % (rusage[0],rusage[1]))
+      session.msg("Process ID:  %10d        %10d bytes per page" % (os.getpid(), psize))
+      session.msg("Time used:   %10d user   %10d sys" % (rusage[0],rusage[1]))
+      session.msg("Integral mem:%10d shared %10d private%10d stack" % (rusage[3], rusage[4], rusage[5]))
+      session.msg("Max res mem: %10d pages  %10d bytes" % (rusage[2],rusage[2] * psize))
+      session.msg("Page faults: %10d hard   %10d soft   %10d swapouts" % (rusage[7], rusage[6], rusage[8]))
+      session.msg("Disk I/O:    %10d reads  %10d writes" % (rusage[9], rusage[10]))
+      session.msg("Network I/O: %10d in     %10d out" % (rusage[12], rusage[11]))
+      session.msg("Context swi: %10d vol    %10d forced %10d sigs" % (rusage[14], rusage[15], rusage[13]))
+   elif argstr == "flags":
+      session.msg("Flags: "+" ".join(defines_global.SERVER_FLAGS))
+   else:
+      session.msg(msg_invalid)
 
 def cmd_description(cdat):
    """
diff --git a/evennia/trunk/defines_global.py b/evennia/trunk/defines_global.py
index 3470beb8cd..aa119ec546 100755
--- a/evennia/trunk/defines_global.py
+++ b/evennia/trunk/defines_global.py
@@ -11,7 +11,7 @@ OBJECT_TYPES = (
 
 # This is a list of flags that the server actually uses. Anything not in this
 # list is a custom flag.
-SERVER_FLAGS = ["CONNECTED"]
+SERVER_FLAGS = ["CONNECTED", "DARK", "FLOATING", "GAGGED", "HAVEN", "OPAQUE", "SAFE", "SLAVE", "SUSPECT", "TRANSPARENT"]
 
 # These flags are not saved.
 NOSAVE_FLAGS = ["CONNECTED"]
@@ -20,7 +20,7 @@ NOSAVE_FLAGS = ["CONNECTED"]
 NOSET_FLAGS = ["CONNECTED"]
 
 # These attribute names can't be modified by players.
-NOSET_ATTRIBS = ["MONEY"]
+NOSET_ATTRIBS = ["MONEY", "ALIAS"]
 
 # Server version number.
 EVENNIA_VERSION = 'Pre-Alpha'
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
index cacdde8009573b78bd5161bb00de39951c441bf7..c614cd659e0decc6ccfb103d9f28b87b80e86fbf 100755
GIT binary patch
delta 2880
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

delta 329
zcmZpe!QAkJX@Zmx<68z)ps-QrE;Hky&4L`enXT*?tC>PFQWY{%a|#qv^Gb>;6_gYd
zO!XAP^Ycp-+;S4rl@!Voixm=6Qc_bCic6D|Q;Un!N^^25H~(j64B+7fn$5)Q$-rFC
z?76YgmU*)0{ym#nWB#jeW|{DZc~b`q3y|@JdGn8c4h<n*=I0Eo%*l+*E0}LFmoa~2
zPTtrU$XqYT%E}-w%mKGCGO^NtnUz7&pTh&>D$l%>)C%9k;*!)N1%!Z}LP)-XQ>sFF
zQD#X=YM!1xBhV0kj*!&il92p@%w*N%4AtZ!5H~X~T{Srm=%b9(R6PZt;b70{>2Wi$
gG6)NEM#?2t0<8x6gG*5sq@S0Cl|fV#Y!b*x04D}to&W#<

diff --git a/evennia/trunk/server.py b/evennia/trunk/server.py
index 4ee4a42261..fb0c35c1ac 100755
--- a/evennia/trunk/server.py
+++ b/evennia/trunk/server.py
@@ -83,6 +83,7 @@ class Server(dispatcher):
    def shutdown(self, message='The server has been shutdown. Please check back soon.'):
       functions_general.announce_all(message)
       self.game_running = False
+      
    """
    END Server CLASS
    """