ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 03:24:20 +00:00
Code Activity

🐛 Fix commands making no sense

Browse source
This commit is contained in:
Steffo 2021-04-14 02:29:29 +02:00
parent f61566ac24
commit a5f6149f93
Signed by: steffo
GPG key ID: 6965406171929D01
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
royalnet/engineer/command.py
View file

@ -44,7 +44,7 @@ class NotAlphanumericNameError(ValueError, CommandNameException):
""" """
class FullCommand(c.Conversation): class FullCommand:
""" """
A :class:`.FullCommand` is a :class:`~royalnet.engineer.conversation.Conversation` which is started by a A :class:`.FullCommand` is a :class:`~royalnet.engineer.conversation.Conversation` which is started by a
:class:`~royalnet.engineer.projectiles.Projectile` having a text matching the :attr:`.pattern`; :class:`~royalnet.engineer.projectiles.Projectile` having a text matching the :attr:`.pattern`;
@ -61,17 +61,16 @@ class FullCommand(c.Conversation):
self.plain_f = f self.plain_f = f
""" """
A reference to the unteleported function :attr:`.f`\\ . A reference to the unteleported function.
""" """
self.teleported_f = tp.Teleporter(f, validate_input=True, validate_output=False) self.teleported_f = tp.Teleporter(f, validate_input=True, validate_output=False)
""" """
.. todo:: Document this. A reference to the teleported function.
.. seealso:: :class:`royalnet.engineer.teleporter.Teleporter`
""" """
# I have no idea what is wrong with this.
super().__init__(self.run)
if len(names) < 1: if len(names) < 1:
raise MissingNameError(f"Passed 'names' list is empty", names) raise MissingNameError(f"Passed 'names' list is empty", names)
@ -113,14 +112,15 @@ class FullCommand(c.Conversation):
plus = f" + {nc-1} other names" if (nc := len(self.names)) > 1 else "" plus = f" + {nc-1} other names" if (nc := len(self.names)) > 1 else ""
return f"<{self.__class__.__qualname__}: {self.name()!r}{plus}>" return f"<{self.__class__.__qualname__}: {self.name()!r}{plus}>"
def __call__(self, *, _sentry: s.Sentry, **kwargs) -> t.Awaitable[t.Optional[c.ConversationProtocol]]:
"""
.. todo:: Document this.
"""
return self.run(_sentry=_sentry, **kwargs)
async def run(self, *, _sentry: s.Sentry, **kwargs) -> t.Optional[c.ConversationProtocol]: async def run(self, *, _sentry: s.Sentry, **kwargs) -> t.Optional[c.ConversationProtocol]:
""" """
Run the command as if it was a conversation. .. todo:: Document this.
:param _sentry: The :class:`~royalnet.engineer.sentry.Sentry` to use for the conversation.
:param kwargs: Keyword arguments to pass to the wrapped function :attr:`.f` .
:return: The result of the wrapped function :attr:`.f` , or :data:`None` if the first projectile received does
not satisfy the requirements of the command.
""" """
log.debug(f"Awaiting a bullet...") log.debug(f"Awaiting a bullet...")
@ -156,7 +156,7 @@ class FullCommand(c.Conversation):
with _sentry.dispenser().lock(self): with _sentry.dispenser().lock(self):
log.debug(f"Passing args to function: {message_kwargs!r}") log.debug(f"Passing args to function: {message_kwargs!r}")
return await super().__call__( return await self.teleported_f(
_sentry=_sentry, _sentry=_sentry,
_proj=projectile, _proj=projectile,
_msg=msg, _msg=msg,
@ -167,7 +167,7 @@ class FullCommand(c.Conversation):
else: else:
log.debug(f"Passing args to function: {message_kwargs!r}") log.debug(f"Passing args to function: {message_kwargs!r}")
return await super().__call__( return await self.teleported_f(
_sentry=_sentry, _sentry=_sentry,
_proj=projectile, _proj=projectile,
_msg=msg, _msg=msg,
@ -182,7 +182,7 @@ class FullCommand(c.Conversation):
:return: The help :class:`str` for this command, or :data:`None` if the command has no docstring. :return: The help :class:`str` for this command, or :data:`None` if the command has no docstring.
""" """
return self.f.__doc__ return self.plain_f.__doc__
class PartialCommand: class PartialCommand: