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

Better handle partial search matches. Resolve #2579

Browse source
This commit is contained in:
Griatch 2022-03-01 18:28:53 +01:00
parent 6028844901
commit d69589ec99
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/objects/manager.py
View file

@ -476,13 +476,19 @@ class ObjectDBManager(TypedObjectManager):
# query - if so, strip it.
match = _MULTIMATCH_REGEX.match(str(searchdata))
match_number = None
stripped_searchdata = searchdata
if match:
# strips the number
match_number, searchdata = match.group("number"), match.group("name")
match_number, stripped_searchdata = match.group("number"), match.group("name")
match_number = int(match_number) - 1
if match_number is not None or not exact:
# run search again, with the exactness set by call
matches = _searcher(searchdata, candidates, typeclass, exact=exact)
if match_number is not None:
# run search against the stripped data
matches = _searcher(stripped_searchdata, candidates, typeclass, exact=True)
if not matches:
# final chance to get a looser match against the number-strippped query
matches = _searcher(stripped_searchdata, candidates, typeclass, exact=False)
elif not exact:
matches = _searcher(searchdata, candidates, typeclass, exact=False)
# deal with result
if len(matches) == 1 and match_number is not None and match_number != 0: