From d3634f32365686cac7907faa440219874a330826 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Tue, 26 Dec 2006 04:20:47 +0000
Subject: [PATCH] Adding the SQLite database to this commit. Oh, and @list
 commands is in, as well as some pieces of @list process.

---
 evennia/trunk/TODO                 |   2 --
 evennia/trunk/commands_general.py  |   2 ++
 evennia/trunk/commands_staff.py    |  23 +++++++++++++++++++++++
 evennia/trunk/evennia.sql          | Bin 0 -> 48128 bytes
 evennia/trunk/functions_db.py      |   1 +
 evennia/trunk/functions_general.py |  19 ++++++++++++++++++-
 evennia/trunk/settings.py          |   2 +-
 7 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100755 evennia/trunk/evennia.sql

diff --git a/evennia/trunk/TODO b/evennia/trunk/TODO
index ddbc5ef245..7f86b610f6 100644
--- a/evennia/trunk/TODO
+++ b/evennia/trunk/TODO
@@ -24,8 +24,6 @@ Medium Priority Tasks
 ---------------------
 * We're going to need a delayed event queue in addition to the scheduler.
   For example: I want player X to perform this action in Y seconds.
-* Implement some of the @list command from MUX2. Most importantly,
-  '@list commands'.
 
 Low Priority Tasks
 ------------------
diff --git a/evennia/trunk/commands_general.py b/evennia/trunk/commands_general.py
index 6d869260b8..c3eb20beb8 100644
--- a/evennia/trunk/commands_general.py
+++ b/evennia/trunk/commands_general.py
@@ -6,6 +6,7 @@ import functions_help
 import global_defines
 import session_mgr
 import ansi
+import os
 """
 Generic command module. Pretty much every command should go here for
 now.
@@ -269,3 +270,4 @@ def cmd_uptime(cdat):
    session.msg('Current server time : %s' % (time.strftime('%a %b %d %H:%M %Y (%Z)', time.localtime(),)))
    session.msg('Server start time   : %s' % (time.strftime('%a %b %d %H:%M %Y', time.localtime(server.start_time),)))
    session.msg('Server uptime       : %s' % functions_general.time_format(start_delta, style=2))
+   session.msg('Server load (1 min) : %s' % os.getloadavg())
diff --git a/evennia/trunk/commands_staff.py b/evennia/trunk/commands_staff.py
index 1ccddaa29e..55c7ec660a 100644
--- a/evennia/trunk/commands_staff.py
+++ b/evennia/trunk/commands_staff.py
@@ -1,6 +1,10 @@
+import os
+import resource
+
 import functions_db
 import functions_general
 import commands_general
+import commands_unloggedin
 import cmdhandler
 import session_mgr
 import ansi
@@ -63,6 +67,25 @@ def cmd_destroy(cdat):
    session.msg("You destroy %s." % (target_obj,))
    target_obj.destroy()
 
+def cmd_list(cdat):
+   """
+   Shows some game related information.
+   """
+   session = cdat['session']
+   pobject = session.get_pobject()
+   args = cdat['uinput']['splitted'][1:]
+   argstr = ''.join(args)
+   
+   if len(argstr) == 0:   
+      session.msg("Unknown option. Use one of: commands, process")
+   elif argstr == "commands":
+      session.msg('Commands: '+' '.join(functions_general.command_list()))
+   elif argstr == "process":
+      loadvg = os.getloadavg()
+      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]))
+
 def cmd_description(cdat):
    """
    Set an object's description.
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
new file mode 100755
index 0000000000000000000000000000000000000000..a3dbae1c3c99fde0bcebc654b8f76acf7ff4ff40
GIT binary patch
literal 48128
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
LiN#n!I0yU>u(Jh}

literal 0
HcmV?d00001

diff --git a/evennia/trunk/functions_db.py b/evennia/trunk/functions_db.py
index f9b64ee0e3..6d86d0fb6a 100644
--- a/evennia/trunk/functions_db.py
+++ b/evennia/trunk/functions_db.py
@@ -5,6 +5,7 @@ from apps.objects.models import Object
 from apps.config.models import ConfigValue
 import global_defines
 import gameconf
+
 """
 Common database functions.
 """
diff --git a/evennia/trunk/functions_general.py b/evennia/trunk/functions_general.py
index 4945077cce..a8bcffced3 100644
--- a/evennia/trunk/functions_general.py
+++ b/evennia/trunk/functions_general.py
@@ -1,8 +1,25 @@
 import session_mgr
+import commands_staff
+import commands_general
+import commands_unloggedin
 """
 General commonly used functions.
 """
-
+def command_list():
+   """
+   Return a list of all commands.
+   """
+   commands = dir(commands_unloggedin) + dir(commands_general)
+   stf_commands = dir(commands_staff)
+   filtered = [prospect for prospect in commands if "cmd_" in prospect]
+   stf_filtered = [prospect for prospect in stf_commands if "cmd_" in prospect]
+   processed = []
+   for cmd in filtered:
+      processed.append(cmd[4:])
+   for cmd in stf_filtered:
+      processed.append('@%s' %(cmd[4:],))
+   return processed
+   
 def time_format(seconds, style=0):
    """
    Function to return a 'prettified' version of a value in seconds.
diff --git a/evennia/trunk/settings.py b/evennia/trunk/settings.py
index b54f489d29..38c96e83e8 100755
--- a/evennia/trunk/settings.py
+++ b/evennia/trunk/settings.py
@@ -10,7 +10,7 @@ ADMINS = (
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = 'sqlite3'    # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'evennia.sql'  # Or path to database file if using sqlite3.
+DATABASE_NAME = '/home/gtaylor/dev/evennia/evennia.sql'  # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.