home · contact · privacy
Remove inconsequential attribute mapping of ClientWindows to LogScopes.
authorChristian Heller <c.heller@plomlompom.de>
Wed, 24 Sep 2025 04:16:27 +0000 (06:16 +0200)
committerChristian Heller <c.heller@plomlompom.de>
Wed, 24 Sep 2025 04:16:27 +0000 (06:16 +0200)
ircplom/client_tui.py

index 3479ca92c5e77d46279a916b970ccd6cd1e4126d..ddadeb80cf27661037ce87253d580179a9140aa1 100644 (file)
@@ -36,8 +36,7 @@ class _LogScope(Enum):
 
 class _ClientWindow(Window, ClientQueueMixin):
 
-    def __init__(self, scope: _LogScope, **kwargs) -> None:
-        self.scope = scope
+    def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
         self._title = f'{self.client_id} :DEBUG'
 
@@ -321,16 +320,16 @@ class _ClientWindowsManager:
         self.windows: list[_ClientWindow] = []
 
     def _new_win(self, scope: _LogScope, chatname: str = '') -> _ClientWindow:
-        kwargs = {'scope': scope, 'win_cls': _ClientWindow}
         if scope == _LogScope.CHAT:
-            kwargs['win_cls'] = (
-                    _ChannelWindow if self.db.is_chan_name(chatname)
-                    else _QueryWindow)
-            kwargs['chatname'] = chatname
-            kwargs['get_nick_data'] = lambda: (self.db.users['me'].nick
-                                               if 'me' in self.db.users.keys()
-                                               else '?')
-        win = self._tui_new_window(**kwargs)
+            win = self._tui_new_window(
+                    win_cls=(_ChannelWindow if self.db.is_chan_name(chatname)
+                             else _QueryWindow),
+                    chatname=chatname,
+                    get_nick_data=lambda: (self.db.users['me'].nick
+                                           if 'me' in self.db.users.keys()
+                                           else '?'))
+        else:
+            win = self._tui_new_window(win_cls=_ClientWindow)
         self.windows += [win]
         return win
 
@@ -341,7 +340,7 @@ class _ClientWindowsManager:
             ret = [w for w in self.windows
                    if w not in self.windows_for(_LogScope.DEBUG)]
         elif scope == _LogScope.DEBUG:
-            ret = [w for w in self.windows if w.scope == _LogScope.DEBUG]
+            ret = [w for w in self.windows if not isinstance(w, _ChatWindow)]
         elif scope == _LogScope.CHAT:
             ret = [w for w in self.windows
                    if isinstance(w, _ChatWindow) and w.chatname == id_]