From: Christian Heller Date: Wed, 6 Aug 2025 22:32:13 +0000 (+0200) Subject: Improve code readability / decryptify method names. X-Git-Url: https://plomlompom.com/repos/booking/%7B%7B%20web_path%20%7D%7D/decks/static/day?a=commitdiff_plain;h=HEAD;p=ircplom Improve code readability / decryptify method names. --- diff --git a/ircplom/client.py b/ircplom/client.py index 0ce10bc..5e1b3e4 100644 --- a/ircplom/client.py +++ b/ircplom/client.py @@ -53,7 +53,7 @@ class _IrcConnection(BaseIrcConnection, ClientIdMixin): class ClientQueueMixin(QueueMixin, ClientIdMixin): 'To QueueMixin adds _cput to send ClientEvent for self.' - def _cput(self, t_method: str, **kwargs) -> None: + def _client_trigger(self, t_method: str, **kwargs) -> None: self._put(ClientEvent.affector(t_method, client_id=self.client_id ).kw(**kwargs)) @@ -198,7 +198,7 @@ class Client(ABC, ClientQueueMixin): port=self.conn_setup.port, _q_out=self._q_out, client_id=self.client_id) - self._cput('_on_connect') + self._client_trigger('_on_connect') except IrcConnAbortException as e: self.log.alert(str(e)) except Exception as e: # pylint: disable=broad-exception-caught diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py index ad52f58..6faa715 100644 --- a/ircplom/client_tui.py +++ b/ircplom/client_tui.py @@ -30,7 +30,8 @@ class _ClientWindow(Window, ClientQueueMixin): return f'{super()._status_title}|{self.client_id}|{self.stream}' def _send_msg(self, verb: str, params: tuple[str, ...], **kwargs) -> None: - self._cput('send', msg=IrcMessage(verb=verb, params=params), **kwargs) + self._client_trigger('send', msg=IrcMessage(verb=verb, params=params), + **kwargs) def cmd__disconnect(self, quit_msg: str = 'ircplom says bye') -> None: 'Send QUIT command to server.' @@ -38,7 +39,7 @@ class _ClientWindow(Window, ClientQueueMixin): def cmd__reconnect(self) -> None: 'Attempt reconnection.' - self._cput('start_connecting') + self._client_trigger('start_connecting') def cmd__nick(self, new_nick: str) -> None: 'Attempt nickname change.' @@ -174,14 +175,14 @@ class ClientTui(BaseTui): class _ClientKnowingTui(Client): - def _ctput(self, todo: str, **kwargs) -> None: - kwargs |= {'client_id': self.client_id, 'todo': todo} - self._put(TuiEvent.affector('for_client_do').kw(**kwargs)) + def _client_tui_trigger(self, todo: str, **kwargs) -> None: + self._put(TuiEvent.affector('for_client_do').kw( + client_id=self.client_id, todo=todo, **kwargs)) def _log(self, msg: str, stream: str = STREAM_SERVER) -> None: - self._ctput('log', stream=stream, msg=msg) + self._client_tui_trigger('log', stream=stream, msg=msg) def update_login(self, nick_confirmed: bool, nickname: str = '') -> None: super().update_login(nick_confirmed, nickname) - self._ctput('update', nick_confirmed=self.nick_confirmed, - nickname=self.conn_setup.nickname) + self._client_tui_trigger('update', nick_confirmed=self.nick_confirmed, + nickname=self.conn_setup.nickname)