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

Suggested refactors and change to test exact match

Browse source
This commit is contained in:
BlauFeuer 2018-03-10 22:41:16 -05:00 • committed by GitHub
parent 4af7164d62
commit ef64d8c413
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/commands/default/muxcommand.py
View file

@ -114,6 +114,8 @@ class MuxCommand(Command):
# split out switches # split out switches
switches, delimiters = [], self.rhs_split switches, delimiters = [], self.rhs_split
if self.switch_options:
self.switch_options = [opt.lower() for opt in self.switch_options]
if args and len(args) > 1 and raw[0] == "/": if args and len(args) > 1 and raw[0] == "/":
# we have a switch, or a set of switches. These end with a space. # we have a switch, or a set of switches. These end with a space.
switches = args[1:].split(None, 1) switches = args[1:].split(None, 1)
@ -127,16 +129,16 @@ class MuxCommand(Command):
if switches and self.switch_options: if switches and self.switch_options:
valid_switches, unused_switches, extra_switches = [], [], [] valid_switches, unused_switches, extra_switches = [], [], []
for element in switches: for element in switches:
option_check = [each for each in self.switch_options option_check = [opt for opt in self.switch_options if opt == element]
if each.lower() == element.lower() or if not option_check:
each.lower().startswith(element.lower())] option_check = [opt for opt in self.switch_options if opt.startswith(element)]
match_count = len(option_check) match_count = len(option_check)
if match_count > 1: if match_count > 1:
extra_switches += option_check # Either the option provided is ambiguous, extra_switches.extend(option_check) # Either the option provided is ambiguous,
elif match_count == 1: elif match_count == 1:
valid_switches += option_check # or it is a valid option abbreviation, valid_switches.extend(option_check) # or it is a valid option abbreviation,
elif match_count == 0: elif match_count == 0:
unused_switches += [element] # or an extraneous option to be ignored. unused_switches.append(element) # or an extraneous option to be ignored.
if extra_switches: # User provided switches if extra_switches: # User provided switches
self.msg('|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?' % self.msg('|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?' %
(self.cmdstring, ' |nor /|C'.join(extra_switches))) (self.cmdstring, ' |nor /|C'.join(extra_switches)))