From: Christian Heller Date: Tue, 23 Sep 2025 15:12:12 +0000 (+0200) Subject: Refactor Client._log into ._alert since client.py anyways only uses it for that. X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=fdc48919c35ce4116d03078112b6a3df9f107390;p=ircplom Refactor Client._log into ._alert since client.py anyways only uses it for that. --- diff --git a/ircplom/client.py b/ircplom/client.py index 3eb934d..d0bc4b8 100644 --- a/ircplom/client.py +++ b/ircplom/client.py @@ -862,7 +862,7 @@ class Client(ABC, ClientQueueMixin): pass @abstractmethod - def _log(self, msg: str, **kwargs) -> None: + def _alert(self, msg: str) -> None: pass def send(self, verb: str, *args) -> IrcMessage: @@ -925,9 +925,9 @@ class Client(ABC, ClientQueueMixin): if 'nick' not in ret: alert += ', giving up' self.close() - self._log(alert, alert=True) + self._alert(alert) elif ret['_verb'] == '433': # ERR_NICKNAMEINUSE - self._log('nickname already in use, trying increment', alert=True) + self._alert('nickname already in use, trying increment') self.send('NICK', _NickUserHost(nick=ret['used']).incremented) elif ret['_verb'] == 'AUTHENTICATE': auth = b64encode((self.db.nick_wanted + '\0' diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py index e7adda2..da454cc 100644 --- a/ircplom/client_tui.py +++ b/ircplom/client_tui.py @@ -534,16 +534,16 @@ class ClientKnowingTui(Client): try: super().handle_msg(msg) except ImplementationFail as e: - self._log(str(e), alert=True) + self._alert(str(e)) except TargetUserOffline as e: name = f'{e}' self._log(f'{name} not online', scope=_LogScope.CHAT, log_target=name, alert=True) - def _log(self, msg: str, scope: Optional[_LogScope] = None, **kwargs - ) -> None: - if not scope: - scope = _LogScope.DEBUG + def _alert(self, msg: str) -> None: + self._log(msg, scope=_LogScope.DEBUG, alert=True) + + def _log(self, msg: str, scope: _LogScope, **kwargs) -> None: self._client_tui_trigger('log', scope=scope, msg=msg, **kwargs) if scope == _LogScope.RAW: with open(f'{self.client_id}.log', 'a', encoding='utf8') as f: