Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-30 04:27:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructured the way typeclasses are loaded. This makes it possible to run at_init() hooks at initiation also for objects without any custom cases for character/players. at_init() hooks are called only when an object is initiated. This means that a room's at_init() hook is only called when someone looks or enters it or a script operates on it, for example, rest of the time these objects are dormant, most efficiently.

Browse source
This commit is contained in:
Griatch 2011-10-01 22:00:22 +02:00
parent 0a1bcd36c2
commit 23cd9e31b1
14 changed files with 142 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/typeclasses/managers.py
View file

@ -55,7 +55,7 @@ def returns_typeclass_list(method):
obj_classes = []
for dbobj in match:
try:
obj_classes.append(dbobj.typeclass(dbobj))
obj_classes.append(dbobj.typeclass)
except Exception:
obj_classes.append(dbobj)
#logger.log_trace()

27
src/typeclasses/models.py
View file

@ -730,7 +730,7 @@ class TypedObject(SharedMemoryModel):
# try to look back to this very database object.)
typeclass = object.__getattribute__(self, 'typeclass')
if typeclass:
return object.__getattribute__(typeclass(self), propname)
return object.__getattribute__(typeclass, propname)
else:
raise AttributeError
@ -765,9 +765,10 @@ class TypedObject(SharedMemoryModel):
typeclass = object.__getattribute__(self, "cached_typeclass")
try:
if typeclass and object.__getattribute__(typeclass, "path") == path:
# don't call at_init() when returning from cache
return typeclass
except AttributeError:
pass
pass
errstring = ""
if not path:
@ -789,7 +790,12 @@ class TypedObject(SharedMemoryModel):
object.__setattr__(self, 'db_typeclass_path', tpath)
object.__getattribute__(self, 'save')()
object.__setattr__(self, "cached_typeclass_path", tpath)
object.__setattr__(self, "cached_typeclass", typeclass)
typeclass = typeclass(self)
object.__setattr__(self, "cached_typeclass", typeclass)
try:
typeclass.at_init()
except Exception:
logger.log_trace()
return typeclass
elif hasattr(typeclass, '__file__'):
errstring += "\n%s seems to be just the path to a module. You need" % tpath
@ -894,13 +900,19 @@ class TypedObject(SharedMemoryModel):
if not callable(typeclass):
# if this is still giving an error, Evennia is wrongly configured or buggy
raise Exception("CRITICAL ERROR: The final fallback typeclass %s cannot load!!" % defpath)
typeclass = typeclass(self)
if save:
object.__setattr__(self, 'db_typeclass_path', defpath)
object.__getattribute__(self, 'save')()
if cache:
object.__setattr__(self, "cached_typeclass_path", defpath)
object.__setattr__(self, "cached_typeclass", typeclass)
return typeclass
try:
typeclass.at_init()
except Exception:
logger.log_trace()
return typeclass
def is_typeclass(self, typeclass, exact=False):
"""
@ -919,13 +931,14 @@ class TypedObject(SharedMemoryModel):
typeclass = typeclass.path
except AttributeError:
pass
typeclasses = [typeclass] + ["%s.%s" % (path, typeclass) for path in self.typeclass_paths]
if exact:
current_path = object.__getattribute__(self, "cached_typeclass_path")
return typeclass and current_path == typeclass
return typeclass and any([current_path == typec for typec in typeclasses])
else:
# check parent chain
return any([cls for cls in self.typeclass.mro()
if "%s.%s" % (cls.__module__, cls.__name__) == typeclass])
if any(["%s.%s" % (cls.__module__, cls.__name__) == typec for typec in typeclasses])])
#
# Object manipulation methods
@ -967,7 +980,7 @@ class TypedObject(SharedMemoryModel):
self.save()
# this will automatically use a default class if
# there is an error with the given typeclass.
new_typeclass = self.typeclass(self)
new_typeclass = self.typeclass
if clean_attributes:
# Clean out old attributes