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

Homogenize manager search methods to return querysets. Resolve #2384.

Browse source
This commit is contained in:
Griatch 2022-01-09 17:13:24 +01:00
parent 01af303457
commit 9c0b44e13a
7 changed files with 65 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/scripts/manager.py
View file

@ -28,7 +28,7 @@ class ScriptDBManager(TypedObjectManager):
Querysets or database objects).
dbref (converter)
get_id (or dbref_search)
dbref_search
get_dbref_range
object_totals
typeclass_search
@ -138,6 +138,9 @@ class ScriptDBManager(TypedObjectManager):
on a timer.
typeclass (class or str): Typeclass or path to typeclass.
Returns:
Queryset: An iterable with 0, 1 or more results.
"""
ostring = ostring.strip()
@ -146,10 +149,10 @@ class ScriptDBManager(TypedObjectManager):
if dbref:
# this is a dbref, try to find the script directly
dbref_match = self.dbref_search(dbref)
if dbref_match and not (
(obj and obj != dbref_match.obj) or (only_timed and dbref_match.interval)
):
return [dbref_match]
if dbref_match:
dmatch = dbref_match[0]
if not (obj and obj != dmatch.obj) or (only_timed and dmatch.interval):
return dbref_match
if typeclass:
if callable(typeclass):