Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I'm pretty much ditching all of the caching I was doing for the sake of simplicity and probably not being necessary. I've attempted to commit something that is more or less identical to the previous revision in functionality, but completely different under the hood. Going to need a lot of testing to verify everything is working.

Browse source
This commit is contained in:
Greg Taylor 2006-12-21 09:12:38 +00:00
parent 1b03c8cf31
commit 81d9eb313a
8 changed files with 285 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

57
evennia/trunk/server.py
View file

@ -3,9 +3,10 @@ from asynchat import async_chat
import socket, asyncore, time, sys
from sessions import PlayerSession
from django.db import models
from django.db import connection
from django.contrib.auth.models import User
from apps.config.models import ConfigValue, CommandAlias
from apps.objects.models import Object, Attribute
from django.contrib.auth.models import User
from scheduler import Scheduler
import functions_db
import functions_general
@ -21,12 +22,13 @@ class Server(dispatcher):
self.configvalue = {}
self.game_running = True
# Wipe our temporary flags on all of the objects.
cursor = connection.cursor()
cursor.execute("UPDATE objects_object SET nosave_flags=''")
print '-'*50
# Load stuff up into memory for easy/quick access.
self.load_configvalues()
self.load_objects()
self.load_objects_contents()
self.load_attributes()
self.load_cmd_aliases()
# Start accepting connections.
@ -54,44 +56,6 @@ class Server(dispatcher):
print ' Configuration Loaded.'
def load_objects(self):
"""
Load all of our objects into memory.
"""
object_list = Object.objects.all()
for object in object_list:
object.load_flags()
dbnum = object.id
self.object_list[dbnum] = object
print ' Objects Loaded: %d' % (len(self.object_list),)
def load_objects_contents(self):
"""
Populate the 'contents_list' list for each object.
TODO: This thing is just completely shot. No idea what's going on but
it's bad mojo.
"""
"""
object_list = Object.objects.all()
for object in object_list:
if object.location and not object.is_room():
object.load_to_location()
#print 'Adding %s to %s' % (object.id, object.location.id,)
for object in object_list:
print 'OBJ: %s CON: %s' % (object.id, object.location,)
print ' * Object Inventories Populated'
"""
def load_attributes(self):
"""
Load all of our attributes into memory.
"""
attribute_list = Attribute.objects.all()
for attrib in attribute_list:
attrib.object.attrib_list[attrib.name] = attrib
print ' Attributes Loaded: %d' % (len(attribute_list),)
def load_cmd_aliases(self):
"""
Load up our command aliases.
@ -120,6 +84,15 @@ class Server(dispatcher):
Adds an object to the cached object list.
"""
self.object_list[object.id] = object
def remove_object_from_cache(self, object):
"""
Removes an object from the cache.
"""
if self.object_list.has_key(object.id):
del self.object_list[object.id]
else:
print 'ERROR: Trying to remove non-cached object: %s' % (object,)
def get_configvalue(self, configname):
"""