get_session should return attached local session by default

Author: will-ockmore

tests/test_util.py

@@ -5,7 +5,7 @@
 
 from tmuxp import exc
 from tmuxp.exc import BeforeLoadScriptError, BeforeLoadScriptNotExists
-from tmuxp.util import run_before_script
+from tmuxp.util import run_before_script, get_session
 
 from . import fixtures_dir
 
@@ -49,3 +49,23 @@ def test_beforeload_returns_stderr_messages():
     with pytest.raises(exc.BeforeLoadScriptError) as excinfo:
         run_before_script(script_file)
         assert excinfo.match(r'failed with returncode')
+
+
+def test_get_session_should_default_to_local_attached_session(server, monkeypatch):
+    server.new_session(session_name='myfirstsession')
+    second_session = server.new_session(session_name='mysecondsession')
+
+    # Assign an active pane to the session
+    first_pane_on_second_session_id = second_session.list_windows()[0].list_panes()[0][
+        'pane_id'
+    ]
+    monkeypatch.setenv('TMUX_PANE', first_pane_on_second_session_id)
+
+    assert get_session(server) == second_session
+
+
+def test_get_session_should_raise_exception_if_no_session(server):
+    first_session = server.new_session(session_name='myfirstsession')
+    server.new_session(session_name='mysecondsession')
+
+    assert get_session(server) == first_session

tmuxp/cli.py

@@ -924,7 +924,7 @@ def command_freeze(session_name, socket_name, socket_path, force):
         if session_name:
             session = t.find_where({'session_name': session_name})
         else:
-            session = t.list_sessions()[0]
+            session = util.get_session(t)
 
         if not session:
             raise exc.TmuxpException('Session not found.')

tmuxp/util.py

@@ -111,10 +111,17 @@ def get_session(server, session_name=None, current_pane=None):
     elif current_pane is not None:
         session = server.find_where({'session_id': current_pane['session_id']})
     else:
-        session = server.list_sessions()[0]
+        current_pane = get_current_pane(server)
+        if current_pane:
+            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)
+        if session_name:
+            raise exc.TmuxpException('Session not found: %s' % session_name)
+        else:
+            raise exc.TmuxpException('Session not found')
 
     return session