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

Add ability to search_script by typeclass

Browse source
This commit is contained in:
Griatch 2017-10-14 20:15:44 +02:00
parent a447a22c87
commit 3e02f96566
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/scripts/manager.py
View file

@ -214,7 +214,7 @@ class ScriptDBManager(TypedObjectManager):
VALIDATE_ITERATION -= 1 VALIDATE_ITERATION -= 1
return nr_started, nr_stopped return nr_started, nr_stopped
def search_script(self, ostring, obj=None, only_timed=False): def search_script(self, ostring, obj=None, only_timed=False, typeclass=None):
""" """
Search for a particular script. Search for a particular script.
@ -224,6 +224,7 @@ class ScriptDBManager(TypedObjectManager):
this object this object
only_timed (bool): Limit search only to scripts that run only_timed (bool): Limit search only to scripts that run
on a timer. on a timer.
typeclass (class or str): Typeclass or path to typeclass.
""" """
@ -237,10 +238,17 @@ class ScriptDBManager(TypedObjectManager):
(only_timed and dbref_match.interval)): (only_timed and dbref_match.interval)):
return [dbref_match] return [dbref_match]
if typeclass:
if callable(typeclass):
typeclass = u"%s.%s" % (typeclass.__module__, typeclass.__name__)
else:
typeclass = u"%s" % typeclass
# not a dbref; normal search # not a dbref; normal search
obj_restriction = obj and Q(db_obj=obj) or Q() obj_restriction = obj and Q(db_obj=obj) or Q()
timed_restriction = only_timed and Q(interval__gt=0) or Q() timed_restriction = only_timed and Q(db_interval__gt=0) or Q()
scripts = self.filter(timed_restriction & obj_restriction & Q(db_key__iexact=ostring)) typeclass_restriction = typeclass and Q(db_typeclass_path=typeclass) or Q()
scripts = self.filter(timed_restriction & obj_restriction & typeclass_restriction & Q(db_key__iexact=ostring))
return scripts return scripts
# back-compatibility alias # back-compatibility alias
script_search = search_script script_search = search_script