Garmelon/yaboli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check if a command has arguments

Browse source
This commit is contained in:
Joscha 2019-04-11 23:26:58 +00:00
parent 788b116d83
commit ee726b93ff
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
yaboli/command.py
View file

@ -102,6 +102,9 @@ class ArgumentData:
self._fancy = self._parse_fancy(basic) self._fancy = self._parse_fancy(basic)
return self._fancy return self._fancy
def has_args(self) -> bool:
return bool(self.basic()) # The list of arguments is empty
class SpecificArgumentData(ArgumentData): class SpecificArgumentData(ArgumentData):
def __init__(self, nick: str, argstr: str) -> None: def __init__(self, nick: str, argstr: str) -> None:
super().__init__(argstr) super().__init__(argstr)
@ -224,7 +227,7 @@ class GeneralCommand(Command):
data: CommandData, data: CommandData,
) -> None: ) -> None:
# Do we have arguments if we shouldn't? # Do we have arguments if we shouldn't?
if not self._args and data.general.basic(): if not self._args and data.general.has_args():
return return
await self._cmdfunc(room, message, data.general) await self._cmdfunc(room, message, data.general)
@ -263,7 +266,7 @@ class SpecificCommand(Command):
return # Yay, a rare occurrence of this structure! return # Yay, a rare occurrence of this structure!
# Do we have arguments if we shouldn't? # Do we have arguments if we shouldn't?
if not self._args and data.specific.basic(): if not self._args and data.specific.has_args():
return return
await self._cmdfunc(room, message, data.specific) await self._cmdfunc(room, message, data.specific)