Keep helper methods in util

Author: tony

tmuxp/cli.py

@@ -19,7 +19,7 @@
 from libtmux.exc import TmuxCommandNotFound
 from libtmux.server import Server
 
-from . import config, exc, log, shell, util
+from . import config, exc, log, util
 from .__about__ import __version__
 from ._compat import string_types
 from .workspacebuilder import WorkspaceBuilder, freeze
@@ -682,19 +682,19 @@ def command_shell(session_name, window_name, socket_name, socket_path, command):
     """
     server = Server(socket_name=socket_name, socket_path=socket_path)
 
-    shell.raise_if_tmux_not_running(server=server)
+    util.raise_if_tmux_not_running(server=server)
 
-    current_pane = shell.get_current_pane(server=server)
+    current_pane = util.get_current_pane(server=server)
 
-    session = shell.get_session(
+    session = util.get_session(
         server=server, session_name=session_name, current_pane=current_pane
     )
 
-    window = shell.get_window(
+    window = util.get_window(
         session=session, window_name=window_name, current_pane=current_pane
     )
 
-    pane = shell.get_pane(window=window, current_pane=current_pane)  # NOQA: F841
+    pane = util.get_pane(window=window, current_pane=current_pane)  # NOQA: F841
 
     if command is not None:
         exec(command)
@@ -734,19 +734,19 @@ def command_shell_plus(
     """
     server = Server(socket_name=socket_name, socket_path=socket_path)
 
-    shell.raise_if_tmux_not_running(server=server)
+    util.raise_if_tmux_not_running(server=server)
 
-    current_pane = shell.get_current_pane(server=server)
+    current_pane = util.get_current_pane(server=server)
 
-    session = shell.get_session(
+    session = util.get_session(
         server=server, session_name=session_name, current_pane=current_pane
     )
 
-    window = shell.get_window(
+    window = util.get_window(
         session=session, window_name=window_name, current_pane=current_pane
     )
 
-    pane = shell.get_pane(window=window, current_pane=current_pane)  # NOQA: F841
+    pane = util.get_pane(window=window, current_pane=current_pane)  # NOQA: F841
 
     if command is not None:
         exec(command)

tmuxp/shell.py

@@ -13,6 +13,8 @@
 import subprocess
 import sys
 
+from libtmux.exc import LibTmuxException
+
 from . import exc
 from ._compat import console_to_str
 
@@ -74,3 +76,70 @@ def oh_my_zsh_auto_title():
                     'Then create a new shell or type:\n\n'
                     '\t$ source ~/.zshrc'
                 )
+
+
+def raise_if_tmux_not_running(server):
+    """Raise exception if not running. More descriptive error if no server found."""
+    try:
+        server.sessions
+    except LibTmuxException as e:
+        if 'No such file or directory' in str(e):
+            raise LibTmuxException(
+                'no tmux session found. Start a tmux session and try again. \n'
+                'Original error: ' + str(e)
+            )
+        else:
+            raise e
+
+
+def get_current_pane(server):
+    """Return Pane if one found in env"""
+    if os.getenv('TMUX_PANE') is not None:
+        try:
+            return [
+                p
+                for p in server._list_panes()
+                if p.get('pane_id') == os.getenv('TMUX_PANE')
+            ][0]
+        except IndexError:
+            pass
+
+
+def get_session(server, session_name=None, current_pane=None):
+    if session_name:
+        session = server.find_where({'session_name': session_name})
+    elif current_pane is not None:
+        session = server.find_where({'session_id': current_pane['session_id']})
+    else:
+        session = server.list_sessions()[0]
+
+    if not session:
+        raise exc.TmuxpException('Session not found: %s' % session_name)
+
+    return session
+
+
+def get_window(session, window_name=None, current_pane=None):
+    if window_name:
+        window = session.find_where({'window_name': window_name})
+        if not window:
+            raise exc.TmuxpException('Window not found: %s' % window_name)
+    elif current_pane is not None:
+        window = session.find_where({'window_id': current_pane['window_id']})
+    else:
+        window = session.list_windows()[0]
+
+    return window
+
+
+def get_pane(window, current_pane=None):
+    try:
+        if current_pane is not None:
+            pane = window.find_where({'pane_id': current_pane['pane_id']})  # NOQA: F841
+        else:
+            pane = window.attached_pane  # NOQA: F841
+    except exc.TmuxpException as e:
+        print(e)
+        return
+
+    return pane