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

Made Attributes into a normal Model instead of a SharedMemoryModel (like Tags). Removed artificial exclusivity of strvalue and value on Attributes.

Browse source
This commit is contained in:
Griatch 2014-05-11 08:57:36 +02:00
parent c5839eebba
commit f67effa0f9
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/typeclasses/models.py
View file

@ -65,7 +65,8 @@ _DA = object.__delattr__
#
#------------------------------------------------------------
class Attribute(SharedMemoryModel):
#class Attribute(SharedMemoryModel):
class Attribute(models.Model):
"""
Abstract django model.
@ -115,13 +116,23 @@ class Attribute(SharedMemoryModel):
# Lock handler self.locks
def __init__(self, *args, **kwargs):
"Initializes the parent first -important!"
SharedMemoryModel.__init__(self, *args, **kwargs)
#SharedMemoryModel.__init__(self, *args, **kwargs)
super(Attribute, self).__init__(*args, **kwargs)
self.locks = LazyLoadHandler(self, "locks", LockHandler)
class Meta:
"Define Django meta options"
verbose_name = "Evennia Attribute"
# read-only wrappers
key = property(lambda self: self.db_key)
strvalue = property(lambda self: self.db_strvalue)
category = property(lambda self: self.db_category)
lock_storage = property(lambda self: self.db_lockstorage)
model = property(lambda self: self.db_model)
attrtype = property(lambda self: self.db_attrtype)
date_created = property(lambda self: self.db_date_created)
# Wrapper properties to easily set database fields. These are
# @property decorators that allows to access these fields using
# normal python operations (without having to remember to save()
@ -148,9 +159,11 @@ class Attribute(SharedMemoryModel):
see self.__value_get.
"""
self.db_value = to_pickle(new_value)
self.save()
self.save(update_fields=["db_value"])
try:
self._track_db_value_change.update(self.cached_value)
# eventual OOB hook
#self._track_db_value_change.update(self.cached_value)
self._track_db_value_change.update(self.new_value)
except AttributeError:
pass
return
@ -182,15 +195,9 @@ class Attribute(SharedMemoryModel):
**kwargs - passed to at_access hook along with result.
"""
result = self.locks.check(accessing_obj, access_type=access_type, default=default)
self.at_access(result, **kwargs)
#self.at_access(result, **kwargs)
return result
def at_set(self, new_value):
"""
Hook method called when the attribute changes value.
"""
pass
#
# Handlers making use of the Attribute model
@ -326,12 +333,11 @@ class AttributeHandler(object):
# should catch all cases
if strattr:
# store as a simple string
attr_obj.strvalue = value
attr_obj.value = None
attr_obj.db_strvalue = value
attr_obj.save(update_fields=["db_strvalue"])
else:
# pickle arbitrary data
attr_obj.value = value
attr_obj.strvalue = None
def remove(self, key, raise_exception=False, category=None,
accessing_obj=None, default_access=True):