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

group search multimatches by displayed name

Browse source
This commit is contained in:
Cal 2024-06-28 18:57:10 -06:00
parent aeb0cf6854
commit 675236bb96
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/utils/utils.py
View file

@ -2397,7 +2397,18 @@ def at_search_result(matches, caller, query="", quiet=False, **kwargs):
query=query query=query
) )
for num, result in enumerate(matches): # group results by display name to properly disambiguate
grouped_matches = defaultdict(list)
for item in matches:
group_key = (
item.get_display_name(caller)
if hasattr(item, "get_display_name")
else query
)
grouped_matches[group_key].append(item)
for key, match_list in grouped_matches.items():
for num, result in enumerate(match_list):
# we need to consider that result could be a Command, where .aliases # we need to consider that result could be a Command, where .aliases
# is a list of strings # is a list of strings
if hasattr(result.aliases, "all"): if hasattr(result.aliases, "all"):
@ -2411,11 +2422,7 @@ def at_search_result(matches, caller, query="", quiet=False, **kwargs):
error += _MULTIMATCH_TEMPLATE.format( error += _MULTIMATCH_TEMPLATE.format(
number=num + 1, number=num + 1,
name=( name=key,
result.get_display_name(caller)
if hasattr(result, "get_display_name")
else query
),
aliases=" [{alias}]".format(alias=";".join(aliases)) if aliases else "", aliases=" [{alias}]".format(alias=";".join(aliases)) if aliases else "",
info=result.get_extra_info(caller), info=result.get_extra_info(caller),
) )