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

MuxCommand multi-delimiter for splits parse tweaks

Browse source
This commit is contained in:
BlauFeuer 2018-03-05 20:11:37 -05:00 • committed by GitHub
parent e78de5f7f0
commit 4bcdeb4825
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class MuxCommand(Command):
command (without the /)) command (without the /))
self.rhs_split - Alternate string delimiter or tuple of strings self.rhs_split - Alternate string delimiter or tuple of strings
to separate left/right hand sides. tuple form to separate left/right hand sides. tuple form
gives priority split to first string delimeter. gives priority split to first string delimiter.
This parser breaks self.args into its constituents and stores them in the This parser breaks self.args into its constituents and stores them in the
following variables: following variables:
@ -149,13 +149,15 @@ class MuxCommand(Command):
# check for arg1, arg2, ... = argA, argB, ... constructs # check for arg1, arg2, ... = argA, argB, ... constructs
lhs, rhs = args.strip(), None lhs, rhs = args.strip(), None
best_split = self.rhs_split
if lhs: if lhs:
if hasattr(self.rhs_split, '__iter__'): if hasattr(self.rhs_split, '__iter__'): # If delimiter is iterable, try each
best_split = self.rhs_split[0]
for this_split in self.rhs_split: for this_split in self.rhs_split:
if this_split in lhs: # First delimiter to allow a successful if this_split in lhs: # delimiter to allow first successful
best_split = this_split # split is the best split. best_split = this_split # split to be the best split.
break break
else:
best_split = self.rhs_split
# Parse to separate left into left/right sides using best_split delimiter string # Parse to separate left into left/right sides using best_split delimiter string
if best_split in lhs: if best_split in lhs:
lhs, rhs = lhs.split(best_split, 1) lhs, rhs = lhs.split(best_split, 1)