Migration needed. Refactored the config.configValue model into server.ServerConfig (that's what the config model were used for anyway). The new model can handle arbitrary data structures through pickle. Run ./manage.py migrate to sync your database with the new setup.
Moved Connect screens (the text screen first seen when connecting) away from the database and into a module in gamesrc/world. This module allows for conveniently adding new connect screens on the fly. More than one screen in the given module will mean a random screen is used.
This commit is contained in:
parent
f1404356ea
commit
7f9f21f45e
21 changed files with 162 additions and 257 deletions
|
|
@ -1,94 +0,0 @@
|
|||
"""
|
||||
Configuration model - storing global flags on the fly, as
|
||||
opposed to what is set once and for all
|
||||
in the settings file.
|
||||
|
||||
ConnectScreen model - cycling connect screens
|
||||
"""
|
||||
|
||||
from django.db import models
|
||||
from src.utils.idmapper.models import SharedMemoryModel
|
||||
from src.config.manager import ConfigValueManager
|
||||
|
||||
#------------------------------------------------------------
|
||||
#
|
||||
# ConfigValue
|
||||
#
|
||||
#------------------------------------------------------------
|
||||
|
||||
class ConfigValue(SharedMemoryModel):
|
||||
"""
|
||||
On-the fly storage of global settings.
|
||||
|
||||
Properties defined on ConfigValue:
|
||||
key - main identifier
|
||||
value - value stored in key
|
||||
|
||||
"""
|
||||
|
||||
#
|
||||
# ConfigValue database model setup
|
||||
#
|
||||
#
|
||||
# These database fields are all set using their corresponding properties,
|
||||
# named same as the field, but withtout the db_* prefix.
|
||||
|
||||
# main name of the database entry
|
||||
db_key = models.CharField(max_length=100)
|
||||
# config value
|
||||
db_value = models.TextField()
|
||||
|
||||
# Database manager
|
||||
objects = ConfigValueManager()
|
||||
|
||||
# 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()
|
||||
# etc). So e.g. a property 'attr' has a get/set/del decorator
|
||||
# defined that allows the user to do self.attr = value,
|
||||
# value = self.attr and del self.attr respectively (where self
|
||||
# is the object in question).
|
||||
|
||||
# key property (wraps db_key)
|
||||
#@property
|
||||
def key_get(self):
|
||||
"Getter. Allows for value = self.key"
|
||||
return self.db_key
|
||||
#@key.setter
|
||||
def key_set(self, value):
|
||||
"Setter. Allows for self.key = value"
|
||||
self.db_key = value
|
||||
self.save()
|
||||
#@key.deleter
|
||||
def key_del(self):
|
||||
"Deleter. Allows for del self.key. Deletes entry."
|
||||
self.delete()
|
||||
key = property(key_get, key_set, key_del)
|
||||
|
||||
# value property (wraps db_value)
|
||||
#@property
|
||||
def value_get(self):
|
||||
"Getter. Allows for value = self.value"
|
||||
return self.db_value
|
||||
#@value.setter
|
||||
def value_set(self, value):
|
||||
"Setter. Allows for self.value = value"
|
||||
self.db_value = value
|
||||
self.save()
|
||||
#@value.deleter
|
||||
def value_del(self):
|
||||
"Deleter. Allows for del self.value. Deletes entry."
|
||||
self.delete()
|
||||
value = property(value_get, value_set, value_del)
|
||||
|
||||
class Meta:
|
||||
"Define Django meta options"
|
||||
verbose_name = "Server Config value"
|
||||
verbose_name_plural = "Server Config values"
|
||||
|
||||
#
|
||||
# ConfigValue other methods
|
||||
#
|
||||
|
||||
def __unicode__(self):
|
||||
return "%s" % self.key
|
||||
Loading…
Add table
Add a link
Reference in a new issue