!squash

Author: tony

libtmux/session.py

@@ -15,6 +15,7 @@
 from . import exc, formats
 from .common import (
     EnvironmentMixin,
+    SessionDict,
     TmuxMappingObject,
     TmuxRelationalObject,
     WindowDict,
@@ -69,11 +70,10 @@ def __init__(self, server: "Server", session_id: str, **kwargs: t.Any) -> None:
         self.server._update_windows()
 
     @property
-    def _info(self) -> Dict[str, str]:
-
+    def _info(self) -> t.Optional[SessionDict]:
         attrs = {"session_id": str(self._session_id)}
 
-        def by(val) -> bool:
+        def by(val: SessionDict) -> bool:
             for key in attrs.keys():
                 try:
                     if attrs[key] != val[key]:
@@ -83,13 +83,15 @@ def by(val) -> bool:
             return True
 
         # TODO add type hint
-        target_sessions = list(filter(by, self.server._sessions))
+        target_sessions = [s for s in self.server._sessions if by(s)]
+        # target_sessions = list(filter(by, self.server._sessions))
         try:
             return target_sessions[0]
         except IndexError as e:
             logger.error(e)
+        return None
 
-    def cmd(self, *args, **kwargs) -> tmux_cmd:
+    def cmd(self, *args: t.Any, **kwargs: t.Any) -> tmux_cmd:
         """
         Return :meth:`server.cmd`.
 
@@ -106,13 +108,17 @@ def cmd(self, *args, **kwargs) -> tmux_cmd:
         # if -t is not set in any arg yet
         if not any("-t" in str(x) for x in args):
             # insert -t immediately after 1st arg, as per tmux format
-            new_args = [args[0]]
-            new_args += ["-t", self.id]
-            new_args += args[1:]
+            new_args: t.Tuple[str, ...] = tuple()
+            new_args += (args[0],)
+            new_args += (
+                "-t",
+                self.id,
+            )
+            new_args += tuple(args[1:])
             args = new_args
         return self.server.cmd(*args, **kwargs)
 
-    def attach_session(self):
+    def attach_session(self) -> None:
         """Return ``$ tmux attach-session`` aka alias: ``$ tmux attach``."""
         proc = self.cmd("attach-session", "-t%s" % self.id)
 
@@ -127,7 +133,7 @@ def kill_session(self) -> None:
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
 
-    def switch_client(self):
+    def switch_client(self) -> None:
         """
         Switch client to this session.
 
@@ -216,7 +222,7 @@ def new_window(
         wformats = ["session_name", "session_id"] + formats.WINDOW_FORMATS
         tmux_formats = ["#{%s}" % f for f in wformats]
 
-        window_args: t.Tuple = tuple()
+        window_args: t.Tuple[str, ...] = tuple()
 
         if not attach:
             window_args += ("-d",)
@@ -243,18 +249,20 @@ def new_window(
         if window_shell:
             window_args += (window_shell,)
 
-        proc = self.cmd("new-window", *window_args)
+        cmd = self.cmd("new-window", *window_args)
 
-        if proc.stderr:
-            raise exc.LibTmuxException(proc.stderr)
+        if cmd.stderr:
+            raise exc.LibTmuxException(cmd.stderr)
 
-        window = proc.stdout[0]
+        window_output = cmd.stdout[0]
 
-        window = dict(zip(wformats, window.split(formats.FORMAT_SEPARATOR)))
+        window_formatters = dict(
+            zip(wformats, window_output.split(formats.FORMAT_SEPARATOR))
+        )
 
         # clear up empty dict
-        window = {k: v for k, v in window.items() if v}
-        window = Window(session=self, **window)
+        window_formatters_filtered = {k: v for k, v in window_formatters.items() if v}
+        window = Window(session=self, **window_formatters_filtered)
 
         self.server._update_windows()
 
@@ -412,12 +420,18 @@ def set_option(
         elif isinstance(value, bool) and not value:
             value = "off"
 
-        tmux_args = tuple()
+        tmux_args: t.Tuple[t.Union[str, int], ...] = tuple()
 
         if _global:
             tmux_args += ("-g",)
 
-        tmux_args += (option, value)
+        assert isinstance(option, str)
+        assert isinstance(value, (str, int))
+
+        tmux_args += (
+            option,
+            value,
+        )
 
         proc = self.cmd("set-option", *tmux_args)
 
@@ -447,34 +461,22 @@ def show_options(
         Uses ``_global`` for keyword name instead of ``global`` to avoid
         colliding with reserved keyword.
         """
-        tmux_args = tuple()
+        tmux_args: t.Tuple[str, ...] = tuple()
 
         if _global:
             tmux_args += ("-g",)
 
         tmux_args += ("show-options",)
         session_output = self.cmd(*tmux_args).stdout
 
-        session_formatters: t.List[t.List[str, t.Union[str, int]]] = []
-
+        session_options: t.Dict[str, t.Union[str, int]] = {}
         for item in session_output:
             key, val = item.split(" ", maxsplit=1)
-            # assert len(raw_formatter) == 2
-            # assert isinstance(raw_formatter[0], str)
-            # assert isinstance(raw_formatter[1], str)
             assert isinstance(key, str)
             assert isinstance(val, str)
-            formatter: t.List[str, t.Union[str, int]] = [key, val]
-
-            session_formatters.append(formatter)
-
-        print(f"session_formatters: {session_formatters}")
-
-        session_options: t.Dict[str, t.Union[str, int]] = dict(session_formatters)
 
-        for key, value in session_options.items():
-            if isinstance(value, str) and value.isdigit():
-                session_options[key] = int(value)
+            if isinstance(val, str) and val.isdigit():
+                session_options[key] = int(val)
 
         return session_options