From 27b31f8cbecf027a4209f53cf311dc047e7e2644 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Tue, 5 Dec 2006 20:57:45 +0000
Subject: [PATCH] Adding the new event scheduler.

---
 evennia/trunk/events.py    | 21 +++++++++++++++++++++
 evennia/trunk/scheduler.py | 36 ++++++++++++++++++++++++++++++++++++
 evennia/trunk/server.py    | 37 +++++--------------------------------
 3 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 evennia/trunk/events.py
 create mode 100644 evennia/trunk/scheduler.py

diff --git a/evennia/trunk/events.py b/evennia/trunk/events.py
new file mode 100644
index 0000000000..9a0f107b0b
--- /dev/null
+++ b/evennia/trunk/events.py
@@ -0,0 +1,21 @@
+"""
+This is the events module, where all of the code for periodic events needs
+to reside.
+
+ADDING AN EVENT:
+* Add an entry to the 'schedule' dictionary.
+* Add the proper event_ function here.
+* Profit.
+"""
+
+schedule = {
+              'event_example': 60,
+           }
+           
+lastrun = {}
+
+def event_example(server):
+   """
+   This is where the example event would be placed. 
+   """
+   pass
diff --git a/evennia/trunk/scheduler.py b/evennia/trunk/scheduler.py
new file mode 100644
index 0000000000..5e4d472a19
--- /dev/null
+++ b/evennia/trunk/scheduler.py
@@ -0,0 +1,36 @@
+import time
+import events
+
+class Scheduler:
+   """
+   A really simple scheduler. We can probably get a lot fancier with this
+   in the future, but it'll do for now.
+   
+   Open up events.py for a schedule of events and their respective functions.
+   """
+   def __init__(self, server):
+      self.server = server
+      
+   # The timer method to be triggered by the main server loop.
+   def heartbeat(self):
+      """
+      Handle one tic/heartbeat.
+      """
+      tictime = time.time()
+      for event in events.schedule:
+         try: 
+            events.lastrun[event]
+         except: 
+            events.lastrun[event] = time.time()
+         
+         diff = tictime - events.lastrun[event]
+
+         if diff >= events.schedule[event]:
+            event_func = getattr(events, event)
+      
+            if callable(event_func):
+               event_func(self.server)
+               
+            # We'll get a new reading for time for accuracy.
+            events.lastrun[event] = time.time()
+
diff --git a/evennia/trunk/server.py b/evennia/trunk/server.py
index 05dc95f377..70edf9ee72 100755
--- a/evennia/trunk/server.py
+++ b/evennia/trunk/server.py
@@ -7,35 +7,7 @@ from apps.config.models import ConfigValue, CommandAlias
 from apps.objects.models import Object, Attribute
 from django.contrib.auth.models import User
 import functions_db
-
-#
-## Begin: Time Functions
-#
-
-schedule = {'heal':100.0}
-lastrun = {}
-
-def heal():
-        pass
-
-# The timer loop
-def Timer(timer):
-
-   sched = schedule.iteritems()
-   for i in sched:
-      try: lastrun[i[0]]
-      except: lastrun[i[0]] = time.time()
-
-      diff = timer - lastrun[i[0]]
-
-   # Every 100 seconds, run heal(), defined above.
-   if diff >= schedule['heal']:
-      heal()
-      lastrun['heal'] = time.time()
-                        
-#
-## End: Time Functions
-#
+from scheduler import Scheduler
   
 class Server(dispatcher):
    """
@@ -173,11 +145,12 @@ BEGIN MAIN APPLICATION LOGIC
 """
 if __name__ == '__main__':
    server = Server()
-
+   scheduler = Scheduler(server)
+   
    try:
       while server.game_running:
-         asyncore.loop(timeout=5, count=1) # Timer() called every 5 seconds.
-         Timer(time.time())
+         asyncore.loop(timeout=5, count=1)
+         scheduler.heartbeat()
                   
    except KeyboardInterrupt:
       server.announce_all('The server has been shutdown. Please check back soon.\n\r')