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

Added create_* and search_* helper methods directly in the API.

Browse source
This commit is contained in:
Griatch 2012-03-25 17:01:27 +02:00
parent 4398d42360
commit b43fb3156a
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ev.py
View file

@ -110,9 +110,10 @@ db_serverconfs = ServerConfig.objects
del ServerConfig del ServerConfig
# utils # utils
from src.utils import search
from src.utils.search import *
from src.utils.create import *
from src.utils import logger from src.utils import logger
from src.utils import create
from src.utils import utils from src.utils import utils
from src.utils import gametime from src.utils import gametime
from src.utils import ansi from src.utils import ansi

2
src/utils/create.py
View file

@ -30,7 +30,7 @@ from src.utils import logger, utils, idmapper
from src.utils.utils import is_iter, has_parent, inherits_from from src.utils.utils import is_iter, has_parent, inherits_from
# limit symbol import from API # limit symbol import from API
__all__ = ("object", "script", "help_entry", "message", "channel", "player") __all__ = ("create_object", "create_script", "create_help_entry", "create_message", "create_channel", "create_player")
GA = object.__getattribute__ GA = object.__getattribute__

25
src/utils/search.py
View file

@ -29,6 +29,10 @@ Example: To reach the search method 'get_object_with_user'
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
# limit symbol import from API
__all__ = ("search_objects", "search_players", "search_scripts", "search_messages", "search_channels", "search_help_entries")
# import objects this way to avoid circular import problems # import objects this way to avoid circular import problems
ObjectDB = ContentType.objects.get(app_label="objects", model="objectdb").model_class() ObjectDB = ContentType.objects.get(app_label="objects", model="objectdb").model_class()
PlayerDB = ContentType.objects.get(app_label="players", model="playerdb").model_class() PlayerDB = ContentType.objects.get(app_label="players", model="playerdb").model_class()
@ -58,8 +62,8 @@ HelpEntry = ContentType.objects.get(app_label="help", model="helpentry").model_c
# If None, the default 'name' attribute is used. # If None, the default 'name' attribute is used.
# """ # """
objects = ObjectDB.objects.object_search search_objects = ObjectDB.objects.object_search
objects = search_objects
# #
# Search for players # Search for players
# #
@ -76,7 +80,8 @@ objects = ObjectDB.objects.object_search
# ostring = a string or database id. # ostring = a string or database id.
# """ # """
players = PlayerDB.objects.player_search search_players = PlayerDB.objects.player_search
players = search_players
# #
# Searching for scripts # Searching for scripts
@ -91,8 +96,8 @@ players = PlayerDB.objects.player_search
# on a timer. # on a timer.
# """ # """
scripts = ScriptDB.objects.script_search search_scripts = ScriptDB.objects.script_search
scripts = search_scripts
# #
# Searching for communication messages # Searching for communication messages
# #
@ -110,8 +115,8 @@ scripts = ScriptDB.objects.script_search
# one of the other arguments to limit the search. # one of the other arguments to limit the search.
# """ # """
messages = Msg.objects.message_search search_messages = Msg.objects.message_search
messages = search_messages
# #
# Search for Communication Channels # Search for Communication Channels
@ -123,7 +128,8 @@ messages = Msg.objects.message_search
# ostring - the key or database id of the channel. # ostring - the key or database id of the channel.
# """ # """
channels = Channel.objects.channel_search search_channels = Channel.objects.channel_search
channels = search_channels
# #
# Find help entry objects. # Find help entry objects.
@ -136,4 +142,5 @@ channels = Channel.objects.channel_search
# category - limit the search to a particular help topic # category - limit the search to a particular help topic
# """ # """
helpentries = HelpEntry.objects.search_help search_help_entries = HelpEntry.objects.search_help
help_entries = search_help_entries