@locate alias of CmdFind shows location of find

If using `@locate` alias and only one object is found and the found object has a location, display that information.
This commit is contained in:
BlauFeuer 2018-01-15 13:50:08 -05:00 committed by GitHub
parent a9a325fc44
commit ee37070422
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2315,6 +2315,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
else:
result = result[0]
string += "\n|g %s - %s|n" % (result.get_display_name(caller), result.path)
if self.cmdstring == "@locate" and not is_account and result.location:
string += " Location: {}".format(result.location.get_display_name(caller))
else:
# Not an account/dbref search but a wider search; build a queryset.
# Searchs for key and aliases
@ -2350,6 +2352,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
else:
string = "|wOne Match|n(#%i-#%i%s):" % (low, high, restrictions)
string += "\n |g%s - %s|n" % (results[0].get_display_name(caller), results[0].path)
if self.cmdstring == "@locate" and nresults == 1 and results[0].location:
string += " Location: {}".format(results[0].location.get_display_name(caller))
else:
string = "|wMatch|n(#%i-#%i%s):" % (low, high, restrictions)
string += "\n |RNo matches found for '%s'|n" % searchstring