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

Moved all relevant wrappers into being managed by the metaclass. Noting that there are many inconsistent features into the comm system; m2m fields should be moved into handlers rather than what is now used. Some of the non-typeclassed models also really don't need to be idmapped - will probably not change this before merge.

Browse source
This commit is contained in:
Griatch 2013-09-23 23:34:47 +02:00
parent f11f330e95
commit 2a5168ade4
3 changed files with 244 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

224
src/comms/models.py
View file

@ -212,53 +212,53 @@ class Msg(SharedMemoryModel):
# header property (wraps db_header) # header property (wraps db_header)
#@property #@property
def __header_get(self): #def __header_get(self):
"Getter. Allows for value = self.message" # "Getter. Allows for value = self.message"
return self.db_header # return self.db_header
#@message.setter ##@message.setter
def __header_set(self, value): #def __header_set(self, value):
"Setter. Allows for self.message = value" # "Setter. Allows for self.message = value"
if value: # if value:
self.db_header = value # self.db_header = value
self.save() # self.save()
#@message.deleter ##@message.deleter
def __header_del(self): #def __header_del(self):
"Deleter. Allows for del self.message" # "Deleter. Allows for del self.message"
self.db_header = "" # self.db_header = ""
self.save() # self.save()
header = property(__header_get, __header_set, __header_del) #header = property(__header_get, __header_set, __header_del)
# message property (wraps db_message) ## message property (wraps db_message)
#@property ##@property
def __message_get(self): #def __message_get(self):
"Getter. Allows for value = self.message" # "Getter. Allows for value = self.message"
return self.db_message # return self.db_message
#@message.setter ##@message.setter
def __message_set(self, value): #def __message_set(self, value):
"Setter. Allows for self.message = value" # "Setter. Allows for self.message = value"
self.db_message = value # self.db_message = value
self.save() # self.save()
#@message.deleter ##@message.deleter
def __message_del(self): #def __message_del(self):
"Deleter. Allows for del self.message" # "Deleter. Allows for del self.message"
self.db_message = "" # self.db_message = ""
self.save() # self.save()
message = property(__message_get, __message_set, __message_del) #message = property(__message_get, __message_set, __message_del)
# date_sent property (wraps db_date_sent) ## date_sent property (wraps db_date_sent)
#@property ##@property
def __date_sent_get(self): #def __date_sent_get(self):
"Getter. Allows for value = self.date_sent" # "Getter. Allows for value = self.date_sent"
return self.db_date_sent # return self.db_date_sent
#@date_sent.setter ##@date_sent.setter
def __date_sent_set(self, value): #def __date_sent_set(self, value):
"Setter. Allows for self.date_sent = value" # "Setter. Allows for self.date_sent = value"
raise Exception("You cannot edit date_sent!") # raise Exception("You cannot edit date_sent!")
#@date_sent.deleter ##@date_sent.deleter
def __date_sent_del(self): #def __date_sent_del(self):
"Deleter. Allows for del self.date_sent" # "Deleter. Allows for del self.date_sent"
raise Exception("You cannot delete the date_sent property!") # raise Exception("You cannot delete the date_sent property!")
date_sent = property(__date_sent_get, __date_sent_set, __date_sent_del) #date_sent = property(__date_sent_get, __date_sent_set, __date_sent_del)
# hide_from property # hide_from property
#@property #@property
@ -289,19 +289,19 @@ class Msg(SharedMemoryModel):
# lock_storage property (wraps db_lock_storage) # lock_storage property (wraps db_lock_storage)
#@property #@property
def __lock_storage_get(self): #def __lock_storage_get(self):
"Getter. Allows for value = self.lock_storage" # "Getter. Allows for value = self.lock_storage"
return self.db_lock_storage # return self.db_lock_storage
#@nick.setter ##@nick.setter
def __lock_storage_set(self, value): #def __lock_storage_set(self, value):
"""Saves the lock_storagetodate. This is usually not called directly, but through self.lock()""" # """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
self.db_lock_storage = value # self.db_lock_storage = value
self.save() # self.save()
#@nick.deleter ##@nick.deleter
def __lock_storage_del(self): #def __lock_storage_del(self):
"Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead""" # "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self) # logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
lock_storage = property(__lock_storage_get, __lock_storage_set, __lock_storage_del) #lock_storage = property(__lock_storage_get, __lock_storage_set, __lock_storage_del)
# #
# Msg class methods # Msg class methods
@ -438,36 +438,36 @@ class Channel(SharedMemoryModel):
# key property (wraps db_key) # key property (wraps db_key)
#@property #@property
def key_get(self): #def key_get(self):
"Getter. Allows for value = self.key" # "Getter. Allows for value = self.key"
return self.db_key # return self.db_key
#@key.setter ##@key.setter
def key_set(self, value): #def key_set(self, value):
"Setter. Allows for self.key = value" # "Setter. Allows for self.key = value"
self.db_key = value # self.db_key = value
self.save() # self.save()
#@key.deleter ##@key.deleter
def key_del(self): #def key_del(self):
"Deleter. Allows for del self.key" # "Deleter. Allows for del self.key"
raise Exception("You cannot delete the channel key!") # raise Exception("You cannot delete the channel key!")
key = property(key_get, key_set, key_del) #key = property(key_get, key_set, key_del)
# desc property (wraps db_desc) # desc property (wraps db_desc)
#@property #@property
def desc_get(self): #def desc_get(self):
"Getter. Allows for value = self.desc" # "Getter. Allows for value = self.desc"
return self.db_desc # return self.db_desc
#@desc.setter ##@desc.setter
def desc_set(self, value): #def desc_set(self, value):
"Setter. Allows for self.desc = value" # "Setter. Allows for self.desc = value"
self.db_desc = value # self.db_desc = value
self.save() # self.save()
#@desc.deleter ##@desc.deleter
def desc_del(self): #def desc_del(self):
"Deleter. Allows for del self.desc" # "Deleter. Allows for del self.desc"
self.db_desc = "" # self.db_desc = ""
self.save() # self.save()
desc = property(desc_get, desc_set, desc_del) #desc = property(desc_get, desc_set, desc_del)
# aliases property # aliases property
#@property #@property
@ -492,36 +492,36 @@ class Channel(SharedMemoryModel):
# keep_log property (wraps db_keep_log) # keep_log property (wraps db_keep_log)
#@property #@property
def keep_log_get(self): #def keep_log_get(self):
"Getter. Allows for value = self.keep_log" # "Getter. Allows for value = self.keep_log"
return self.db_keep_log # return self.db_keep_log
#@keep_log.setter ##@keep_log.setter
def keep_log_set(self, value): #def keep_log_set(self, value):
"Setter. Allows for self.keep_log = value" # "Setter. Allows for self.keep_log = value"
self.db_keep_log = value # self.db_keep_log = value
self.save() # self.save()
#@keep_log.deleter ##@keep_log.deleter
def keep_log_del(self): #def keep_log_del(self):
"Deleter. Allows for del self.keep_log" # "Deleter. Allows for del self.keep_log"
self.db_keep_log = False # self.db_keep_log = False
self.save() # self.save()
keep_log = property(keep_log_get, keep_log_set, keep_log_del) #keep_log = property(keep_log_get, keep_log_set, keep_log_del)
# lock_storage property (wraps db_lock_storage) # lock_storage property (wraps db_lock_storage)
#@property #@property
def lock_storage_get(self): #def lock_storage_get(self):
"Getter. Allows for value = self.lock_storage" # "Getter. Allows for value = self.lock_storage"
return self.db_lock_storage # return self.db_lock_storage
#@nick.setter ##@nick.setter
def lock_storage_set(self, value): #def lock_storage_set(self, value):
"""Saves the lock_storagetodate. This is usually not called directly, but through self.lock()""" # """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
self.db_lock_storage = value # self.db_lock_storage = value
self.save() # self.save()
#@nick.deleter ##@nick.deleter
def lock_storage_del(self): #def lock_storage_del(self):
"Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead""" # "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self) # logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
lock_storage = property(lock_storage_get, lock_storage_set, lock_storage_del) #lock_storage = property(lock_storage_get, lock_storage_set, lock_storage_del)
class Meta: class Meta:
"Define Django meta options" "Define Django meta options"

68
src/players/models.py
View file

@ -27,7 +27,7 @@ from src.typeclasses.models import TypedObject, TagHandler, NickHandler, AliasHa
from src.commands.cmdsethandler import CmdSetHandler from src.commands.cmdsethandler import CmdSetHandler
from src.commands import cmdhandler from src.commands import cmdhandler
from src.utils import utils from src.utils import utils
from src.utils.utils import to_str from src.utils.utils import to_str, make_iter
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
@ -146,20 +146,18 @@ class PlayerDB(TypedObject, AbstractUser):
#@property #@property
def cmdset_storage_get(self): def cmdset_storage_get(self):
"Getter. Allows for value = self.name. Returns a list of cmdset_storage." "Getter. Allows for value = self.name. Returns a list of cmdset_storage."
if _GA(self, "db_cmdset_storage"): storage = _GA(self, "db_cmdset_storage")
return [path.strip() for path in _GA(self, "db_cmdset_storage").split(',')] # we need to check so storage is not None
return [] return [path.strip() for path in storage.split(',')] if storage else []
#@cmdset_storage.setter #@cmdset_storage.setter
def cmdset_storage_set(self, value): def cmdset_storage_set(self, value):
"Setter. Allows for self.name = value. Stores as a comma-separated string." "Setter. Allows for self.name = value. Stores as a comma-separated string."
if utils.is_iter(value): _SA(self, "db_cmdset_storage", ",".join(str(val).strip() for val in make_iter(value)))
value = ",".join([str(val).strip() for val in value])
_SA(self, "db_cmdset_storage", value)
_GA(self, "save")() _GA(self, "save")()
#@cmdset_storage.deleter #@cmdset_storage.deleter
def cmdset_storage_del(self): def cmdset_storage_del(self):
"Deleter. Allows for del self.name" "Deleter. Allows for del self.name"
_SA(self, "db_cmdset_storage", "") _SA(self, "db_cmdset_storage", None)
_GA(self, "save")() _GA(self, "save")()
cmdset_storage = property(cmdset_storage_get, cmdset_storage_set, cmdset_storage_del) cmdset_storage = property(cmdset_storage_get, cmdset_storage_set, cmdset_storage_del)
@ -195,37 +193,39 @@ class PlayerDB(TypedObject, AbstractUser):
# name property (wraps self.user.username) # name property (wraps self.user.username)
#@property #@property
def __name_get(self): #def __name_get(self):
"Getter. Allows for value = self.name" # "Getter. Allows for value = self.name"
return self.username # return self.username
#name = get_prop_cache(self, "_name") # #name = get_prop_cache(self, "_name")
#if not name: # #if not name:
# name = _GA(self,"user").username # # name = _GA(self,"user").username
# set_prop_cache(self, "_name", name) # # set_prop_cache(self, "_name", name)
#return name # #return name
#@name.setter ##@name.setter
def __name_set(self, value): #def __name_set(self, value):
"Setter. Allows for player.name = newname" # "Setter. Allows for player.name = newname"
self.username = value # _SA(self, "username", value)
#_GA(self, "user").username = value
#_GA(self, "user").save() # #_GA(self, "user").username = value
#set_prop_cache(self, "_name", value) # #_GA(self, "user").save()
#@name.deleter # #set_prop_cache(self, "_name", value)
def __name_del(self): ##@name.deleter
"Deleter. Allows for del self.name" #def __name_del(self):
raise Exception("Player name cannot be deleted!") # "Deleter. Allows for del self.name"
name = property(__name_get, __name_set, __name_del) # raise Exception("Player name cannot be deleted!")
key = property(__name_get, __name_set, __name_del) def __username_get(self):
return _GA(self, "username")
def __username_set(self, value):
_SA(self, "username", value)
def __username_del(self):
_DA(self, "username", value)
name = property(__username_get, __username_set, __username_del)
key = property(__username_get, __username_set, __username_del)
#@property #@property
def __uid_get(self): def __uid_get(self):
"Getter. Retrieves the user id" "Getter. Retrieves the user id"
return self.id return self.id
#uid = get_prop_cache(self, "_uid")
#if not uid:
# uid = _GA(self, "user").id
# set_prop_cache(self, "_uid", uid)
#return uid
def __uid_set(self, value): def __uid_set(self, value):
raise Exception("User id cannot be set!") raise Exception("User id cannot be set!")
def __uid_del(self): def __uid_del(self):

196
src/scripts/models.py
View file

@ -121,122 +121,122 @@ class ScriptDB(TypedObject):
# desc property (wraps db_desc) # desc property (wraps db_desc)
#@property #@property
def __desc_get(self): #def __desc_get(self):
"Getter. Allows for value = self.desc" # "Getter. Allows for value = self.desc"
return self.db_desc # return self.db_desc
#@desc.setter ##@desc.setter
def __desc_set(self, value): #def __desc_set(self, value):
"Setter. Allows for self.desc = value" # "Setter. Allows for self.desc = value"
self.db_desc = value # self.db_desc = value
self.save() # self.save()
#@desc.deleter ##@desc.deleter
def __desc_del(self): #def __desc_del(self):
"Deleter. Allows for del self.desc" # "Deleter. Allows for del self.desc"
self.db_desc = "" # self.db_desc = ""
self.save() # self.save()
desc = property(__desc_get, __desc_set, __desc_del) #desc = property(__desc_get, __desc_set, __desc_del)
# obj property (wraps db_obj) # obj property (wraps db_obj)
#@property #@property
def __obj_get(self): #def __obj_get(self):
"Getter. Allows for value = self.obj" # "Getter. Allows for value = self.obj"
return self.db_obj # return self.db_obj
#@obj.setter ##@obj.setter
def __obj_set(self, value): #def __obj_set(self, value):
"Setter. Allows for self.obj = value" # "Setter. Allows for self.obj = value"
self.db_obj = value # self.db_obj = value
self.save() # self.save()
#@obj.deleter ##@obj.deleter
def __obj_del(self): #def __obj_del(self):
"Deleter. Allows for del self.obj" # "Deleter. Allows for del self.obj"
self.db_obj = None # self.db_obj = None
self.save() # self.save()
obj = property(__obj_get, __obj_set, __obj_del) #obj = property(__obj_get, __obj_set, __obj_del)
# interval property (wraps db_interval) # interval property (wraps db_interval)
#@property #@property
def __interval_get(self): #def __interval_get(self):
"Getter. Allows for value = self.interval" # "Getter. Allows for value = self.interval"
return self.db_interval # return self.db_interval
#@interval.setter ##@interval.setter
def __interval_set(self, value): #def __interval_set(self, value):
"Setter. Allows for self.interval = value" # "Setter. Allows for self.interval = value"
self.db_interval = int(value) # self.db_interval = int(value)
self.save() # self.save()
#@interval.deleter ##@interval.deleter
def __interval_del(self): #def __interval_del(self):
"Deleter. Allows for del self.interval" # "Deleter. Allows for del self.interval"
self.db_interval = 0 # self.db_interval = 0
self.save() # self.save()
interval = property(__interval_get, __interval_set, __interval_del) #interval = property(__interval_get, __interval_set, __interval_del)
# start_delay property (wraps db_start_delay) # start_delay property (wraps db_start_delay)
#@property #@property
def __start_delay_get(self): #def __start_delay_get(self):
"Getter. Allows for value = self.start_delay" # "Getter. Allows for value = self.start_delay"
return self.db_start_delay # return self.db_start_delay
#@start_delay.setter ##@start_delay.setter
def __start_delay_set(self, value): #def __start_delay_set(self, value):
"Setter. Allows for self.start_delay = value" # "Setter. Allows for self.start_delay = value"
self.db_start_delay = value # self.db_start_delay = value
self.save() # self.save()
#@start_delay.deleter ##@start_delay.deleter
def __start_delay_del(self): #def __start_delay_del(self):
"Deleter. Allows for del self.start_delay" # "Deleter. Allows for del self.start_delay"
self.db_start_delay = False # self.db_start_delay = False
self.save() # self.save()
start_delay = property(__start_delay_get, __start_delay_set, __start_delay_del) #start_delay = property(__start_delay_get, __start_delay_set, __start_delay_del)
# repeats property (wraps db_repeats) # repeats property (wraps db_repeats)
#@property #@property
def __repeats_get(self): #def __repeats_get(self):
"Getter. Allows for value = self.repeats" # "Getter. Allows for value = self.repeats"
return self.db_repeats # return self.db_repeats
#@repeats.setter ##@repeats.setter
def __repeats_set(self, value): #def __repeats_set(self, value):
"Setter. Allows for self.repeats = value" # "Setter. Allows for self.repeats = value"
self.db_repeats = int(value) # self.db_repeats = int(value)
self.save() # self.save()
#@repeats.deleter ##@repeats.deleter
def __repeats_del(self): #def __repeats_del(self):
"Deleter. Allows for del self.repeats" # "Deleter. Allows for del self.repeats"
self.db_repeats = 0 # self.db_repeats = 0
self.save() # self.save()
repeats = property(__repeats_get, __repeats_set, __repeats_del) #repeats = property(__repeats_get, __repeats_set, __repeats_del)
# persistent property (wraps db_persistent) # persistent property (wraps db_persistent)
#@property #@property
def __persistent_get(self): #def __persistent_get(self):
"Getter. Allows for value = self.persistent" # "Getter. Allows for value = self.persistent"
return self.db_persistent # return self.db_persistent
#@persistent.setter ##@persistent.setter
def __persistent_set(self, value): #def __persistent_set(self, value):
"Setter. Allows for self.persistent = value" # "Setter. Allows for self.persistent = value"
self.db_persistent = value # self.db_persistent = value
self.save() # self.save()
#@persistent.deleter ##@persistent.deleter
def __persistent_del(self): #def __persistent_del(self):
"Deleter. Allows for del self.persistent" # "Deleter. Allows for del self.persistent"
self.db_persistent = False # self.db_persistent = False
self.save() # self.save()
persistent = property(__persistent_get, __persistent_set, __persistent_del) #persistent = property(__persistent_get, __persistent_set, __persistent_del)
# is_active property (wraps db_is_active) # is_active property (wraps db_is_active)
#@property #@property
def __is_active_get(self): #def __is_active_get(self):
"Getter. Allows for value = self.is_active" # "Getter. Allows for value = self.is_active"
return self.db_is_active # return self.db_is_active
#@is_active.setter ##@is_active.setter
def __is_active_set(self, value): #def __is_active_set(self, value):
"Setter. Allows for self.is_active = value" # "Setter. Allows for self.is_active = value"
self.db_is_active = value # self.db_is_active = value
self.save() # self.save()
#@is_active.deleter ##@is_active.deleter
def __is_active_del(self): #def __is_active_del(self):
"Deleter. Allows for del self.is_active" # "Deleter. Allows for del self.is_active"
self.db_is_active = False # self.db_is_active = False
self.save() # self.save()
is_active = property(__is_active_get, __is_active_set, __is_active_del) #is_active = property(__is_active_get, __is_active_set, __is_active_del)
# #
# #