agatha/maubot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make command arguments map optional and fix optional command arguments

Browse Source
This commit is contained in:
Tulir Asokan 2018-10-21 21:57:34 +03:00
parent a4fb18038c
commit fd14a38546
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maubot/command_spec.py
View File

@ -31,7 +31,7 @@ class Argument(SerializableAttrs['Argument']):
@dataclass @dataclass
class Command(SerializableAttrs['Command']): class Command(SerializableAttrs['Command']):
syntax: str syntax: str
arguments: Dict[str, Argument] arguments: Dict[str, Argument] = {}
description: str = None description: str = None
@ -80,7 +80,9 @@ class ParsedCommand:
arg = command.arguments.get(word, None) arg = command.arguments.get(word, None)
if arg is not None and len(word) > 0: if arg is not None and len(word) > 0:
argument_encountered = True argument_encountered = True
regex = f"({arg.matches})" if arg.required else f"(?:{arg.matches})?" regex = f"({arg.matches})"
if not arg.required:
regex += "?"
self.arguments.append(word) self.arguments.append(word)
regex_builder.append(regex) regex_builder.append(regex)
else: else: