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

Cleans up some verbiage and syntax for fallback idrange.

Browse source
This commit is contained in:
Johnny 2020-01-13 20:10:51 +00:00
parent 3725d94e88
commit e03d4ccaf7
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2789,7 +2789,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
logger.log_trace(e) logger.log_trace(e)
# If that doesn't work for some reason (empty DB?), guess the lower # If that doesn't work for some reason (empty DB?), guess the lower
# bound and do a less-efficient query to find the upper. # bound and do a less-efficient query to find the upper.
low, high = 1, ObjectDB.objects.all().order_by("-id")[0].id low, high = 1, ObjectDB.objects.all().order_by("-id").first().id
if self.rhs: if self.rhs:
# Check that rhs is either a valid dbref or dbref range # Check that rhs is either a valid dbref or dbref range
@ -2817,7 +2817,6 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
restrictions = ", %s" % (", ".join(self.switches)) restrictions = ", %s" % (", ".join(self.switches))
if is_dbref or is_account: if is_dbref or is_account:
if is_dbref: if is_dbref:
# a dbref search # a dbref search
result = caller.search(searchstring, global_search=True, quiet=True) result = caller.search(searchstring, global_search=True, quiet=True)
@ -2854,7 +2853,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
) )
else: else:
# Not an account/dbref search but a wider search; build a queryset. # Not an account/dbref search but a wider search; build a queryset.
# Searchs for key and aliases # Searches for key and aliases
if "exact" in switches: if "exact" in switches:
keyquery = Q(db_key__iexact=searchstring, id__gte=low, id__lte=high) keyquery = Q(db_key__iexact=searchstring, id__gte=low, id__lte=high)
aliasquery = Q( aliasquery = Q(
@ -2917,8 +2916,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
if "loc" in self.switches and nresults == 1 and res and getattr(res, 'location', None): if "loc" in self.switches and nresults == 1 and res and getattr(res, 'location', None):
string += f" (|wlocation|n: |g{res.location.get_display_name(caller)}|n)" string += f" (|wlocation|n: |g{res.location.get_display_name(caller)}|n)"
else: else:
string = "|wMatch|n(#{low}-#{high}{restrictions}):" string = f"|wNo Matches|n(#{low}-#{high}{restrictions}):"
string += "\n |RNo matches found for '{searchstring}'|n" string += f"\n |RNo matches found for '{searchstring}'|n"
# send result # send result
caller.msg(string.strip()) caller.msg(string.strip())