liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split command segments on any whitespace, not just spaces

Browse Source
This commit is contained in:
Ske 2019-05-30 20:24:17 +02:00
parent 9dd3af02b4
commit 8b19f25ed2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pluralkit/bot/commands/__init__.py
View File

@ -11,6 +11,11 @@ from pluralkit.errors import PluralKitError
from pluralkit.member import Member from pluralkit.member import Member
from pluralkit.system import System from pluralkit.system import System
def find_with_predicate(s: str, pred) -> int:
for i, v in enumerate(s):
if pred(v):
return i
return -1
def next_arg(arg_string: str) -> Tuple[str, Optional[str]]: def next_arg(arg_string: str) -> Tuple[str, Optional[str]]:
# A basic quoted-arg parser # A basic quoted-arg parser
@ -25,7 +30,7 @@ def next_arg(arg_string: str) -> Tuple[str, Optional[str]]:
else: else:
return arg_string[1:], None return arg_string[1:], None
next_space = arg_string.find(" ") next_space = find_with_predicate(arg_string, lambda ch: ch.isspace())
if next_space >= 0: if next_space >= 0:
return arg_string[:next_space].strip(), arg_string[next_space:].strip() return arg_string[:next_space].strip(), arg_string[next_space:].strip()
else: else: