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

Add functioning prefix-ignorer and cleanup of code.

Browse source
This commit is contained in:
Griatch 2017-02-17 08:40:32 +01:00
parent d4df0948e3
commit 1fbb4c4358
7 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/commands/cmdparser.py
View file

@ -120,17 +120,10 @@ def cmdparser(raw_string, cmdset, caller, match_index=None):
mindex, new_raw_string = try_num_prefixes(raw_string)
if mindex is not None:
return cmdparser(new_raw_string, cmdset, caller, match_index=int(mindex))
elif _CMD_IGNORE_PREFIXES:
if _CMD_IGNORE_PREFIXES:
# still no match. Try to strip prefixes
new_raw_string = raw_string.lstrip(_CMD_IGNORE_PREFIXES) if len(raw_string) > 1 else raw_string
if len(new_raw_string) < len(raw_string):
raw_string = new_raw_string
matches = build_matches(raw_string, include_prefixes=False)
if not matches:
# try to match a number 1-cmdname, 2-cmdname etc
mindex, new_raw_string = try_num_prefixes(raw_string)
if mindex is not None:
return cmdparser(new_raw_string, cmdset, caller, match_index=int(mindex))
raw_string = raw_string.lstrip(_CMD_IGNORE_PREFIXES) if len(raw_string) > 1 else raw_string
matches = build_matches(raw_string, include_prefixes=False)
# only select command matches we are actually allowed to call.
matches = [match for match in matches if match[2].access(caller, 'cmd')]