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

Re-add dbref match for find command

Browse source
This commit is contained in:
Griatch 2024-03-11 09:06:00 +01:00
parent 6e6ab208a6
commit 1853b29429
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/commands/default/building.py
View file

@ -4,11 +4,10 @@ Building and world design commands
import re import re
import typing import typing
import evennia
from django.conf import settings from django.conf import settings
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.db.models import Max, Min, Q from django.db.models import Max, Min, Q
import evennia
from evennia import InterruptCommand from evennia import InterruptCommand
from evennia.commands.cmdhandler import generate_cmdset_providers, get_and_merge_cmdsets from evennia.commands.cmdhandler import generate_cmdset_providers, get_and_merge_cmdsets
from evennia.locks.lockhandler import LockException from evennia.locks.lockhandler import LockException
@ -3328,14 +3327,23 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
string = f"|w{header}|n(#{low}-#{high}{restrictions}):" string = f"|w{header}|n(#{low}-#{high}{restrictions}):"
res = None res = None
for res in results: for res in results:
string += f"\n |g{res.get_display_name(caller)} - {res.path}|n" string += (
"\n "
f" |g{res.get_display_name(caller)}"
f"{res.get_extra_display_name_info(caller)} -"
f" {res.path}|n"
)
if ( if (
"loc" in self.switches "loc" in self.switches
and nresults == 1 and nresults == 1
and res and res
and getattr(res, "location", None) and getattr(res, "location", None)
): ):
string += f" (|wlocation|n: |g{res.location.get_display_name(caller)}|n)" string += (
" (|wlocation|n:"
f" |g{res.location.get_display_name(caller)}"
f"{res.get_extra_display_name_info(caller)}|n)"
)
else: else:
string = f"|wNo Matches|n(#{low}-#{high}{restrictions}):" string = f"|wNo Matches|n(#{low}-#{high}{restrictions}):"
string += f"\n |RNo matches found for '{searchstring}'|n" string += f"\n |RNo matches found for '{searchstring}'|n"