From: Christian Heller Date: Sat, 20 Sep 2025 09:21:58 +0000 (+0200) Subject: Use more appropriate name DEBUG for LogScope formerly named SERVER. X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=e5269a95ca55f10ce650d858fca693d10a44510e;p=ircplom Use more appropriate name DEBUG for LogScope formerly named SERVER. --- diff --git a/ircplom/client.py b/ircplom/client.py index a23eb44..dec3d2e 100644 --- a/ircplom/client.py +++ b/ircplom/client.py @@ -324,7 +324,7 @@ class Channel: class LogScope(Enum): 'Where log messages should go.' ALL = auto() - SERVER = auto() + DEBUG = auto() RAW = auto() CHAT = auto() USER = auto() diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py index 722ab02..ad21878 100644 --- a/ircplom/client_tui.py +++ b/ircplom/client_tui.py @@ -31,14 +31,14 @@ class _ClientWindow(Window, ClientQueueMixin): self._log = log super().__init__(**kwargs) self._title = f'{self.client_id} '\ - + f':{"SERVER" if self.scope == LogScope.SERVER else "RAW"}' + + f':{"DEBUG" if self.scope == LogScope.DEBUG else "RAW"}' def _send_msg(self, verb: str, params: tuple[str, ...]) -> None: self._client_trigger('send_w_params_tuple', verb=verb, params=params) def cmd__disconnect(self, quit_msg: str = 'ircplom says bye') -> None: 'Send QUIT command to server.' - self._log('requesting disconnect …', scope=LogScope.SERVER) + self._log('requesting disconnect …', scope=LogScope.DEBUG) self._send_msg('QUIT', (quit_msg,)) def cmd__reconnect(self) -> None: @@ -166,7 +166,7 @@ class _UpdatingNode(AutoAttrMixin): self._set(update.key, update.value) do_report |= True if do_report: - update.results += [(LogScope.SERVER, + update.results += [(LogScope.DEBUG, tuple(sorted(update.value)) if isinstance(update.value, set) else update.value)] @@ -294,7 +294,7 @@ class _ClientWindowsManager: self._tui_new_window = tui_new_window self.db = _TuiClientDb() self.windows: list[_ClientWindow] = [] - for scope in (LogScope.SERVER, LogScope.RAW): + for scope in (LogScope.DEBUG, LogScope.RAW): self._new_win(scope) def _new_win(self, scope: LogScope, chatname: str = '') -> _ClientWindow: @@ -339,7 +339,7 @@ class _ClientWindowsManager: 'From parsing scope, kwargs, build prefix before sending to logger.' first_char = '$' sender_label = '' - if 'out' in kwargs and scope != LogScope.SERVER: + if 'out' in kwargs and scope != LogScope.DEBUG: first_char = _LOG_PREFIX_OUT if kwargs['out'] else _LOG_PREFIX_IN if scope == LogScope.CHAT: sender_label = ( @@ -400,9 +400,9 @@ class ClientTui(BaseTui): m = self._client_mngrs[kwargs['client_id']] if scope == LogScope.ALL: return [w for w in m.windows - if w.scope not in {LogScope.SERVER, LogScope.RAW}] - if scope == LogScope.SERVER: - return [m.window(LogScope.SERVER), m.window(LogScope.RAW)] + if w.scope not in {LogScope.DEBUG, LogScope.RAW}] + if scope == LogScope.DEBUG: + return [m.window(LogScope.DEBUG), m.window(LogScope.RAW)] if scope == LogScope.CHAT: chatname = (kwargs['target'] if kwargs['target'] != m.db.users['me'].nick @@ -508,7 +508,7 @@ class ClientKnowingTui(Client): if msg: to_log += [msg] if not scope: - scope = LogScope.SERVER + scope = LogScope.DEBUG for item in to_log: self._client_tui_trigger('log', scope=scope, msg=item, **kwargs) if scope == LogScope.RAW: diff --git a/test.txt b/test.txt index 803917f..ec08fe5 100644 --- a/test.txt +++ b/test.txt @@ -162,7 +162,7 @@ > /list 0 # windows available via /window: 0 # 0) :start -0 # 1) foo.bar.baz :SERVER +0 # 1) foo.bar.baz :DEBUG 0 # 2) foo.bar.baz :RAW 0 # 3) foo.bar.baz SaslServ > /window 1