wip

Author: tony

tests/fixtures/config/shell_command_before_session-expected.yaml

@@ -1,5 +1,6 @@
 shell_command_before:
-  - 'echo "hi"'
+  - shell_command:
+    - 'echo "hi"'
 session_name: 'test'
 windows:
 - window_name: editor

tmuxp/cli.py

@@ -659,6 +659,7 @@ def load_workspace(
         sconfig["session_name"] = new_session_name
     # propagate config inheritance (e.g. session -> window, window -> pane)
     sconfig = config.trickle(sconfig)
+    print(sconfig)
 
     t = Server(  # create tmux server object
         socket_name=socket_name,

tmuxp/config.py

@@ -152,13 +152,13 @@ def inline(sconf):
 
         if len(sconf.keys()) == int(1):
             sconf = sconf["shell_command"]
-    # todo rewrite inlines
-    # if (
-    #     "shell_command_before" in sconf
-    #     and isinstance(sconf["shell_command_before"], list)
-    #     and len(sconf["shell_command_before"]) == 1
-    # ):
-    #     sconf["shell_command_before"] = sconf["shell_command_before"][0]
+
+    if (
+        "shell_command_before" in sconf
+        and isinstance(sconf["shell_command_before"], list)
+        and len(sconf["shell_command_before"]) == 1
+    ):
+        sconf["shell_command_before"] = sconf["shell_command_before"][0]
 
     # recurse into window and pane config items
     if "windows" in sconf:
@@ -271,12 +271,19 @@ def expand(sconf, cwd=None, parent=None):
         sconf["shell_command_before"], list
     ):
         for i, scmd in enumerate(sconf["shell_command_before"]):
-            if isinstance(scmd, dict):
-                scmd["shell_command"] = expandshell(scmd.get("shell_command"))
             if isinstance(scmd, str):
-                scmd = {"shell_command": expandshell(scmd)}
+                scmd = [expandshell(scmd)]
+            if isinstance(scmd, list):
+                for _i, subcmd in enumerate(scmd):
+                    if isinstance(subcmd, str):
+                        subcmd = {"shell_command": subcmd}
+
+                    shell_command = subcmd.get("shell_command")
+                    if isinstance(shell_command, list):
+                        shell_command[:] = [expandshell(_s) for _s in shell_command]
+                    scmd[_i] = subcmd
+
             sconf["shell_command_before"][i] = scmd
-            print(sconf)
 
     # recurse into window and pane config items
     if "windows" in sconf:
@@ -461,7 +468,7 @@ def import_tmuxinator(sconf):
         if "shell_command_before" not in tmuxp_config:
             tmuxp_config["shell_command_before"] = []
         tmuxp_config["shell_command_before"].append(
-            {"shell_command": "rbenv shell %s" % sconf["rbenv"]}
+            {"shell_command": ["rbenv shell %s" % sconf["rbenv"]]}
         )
 
     for w in sconf["windows"]:

tmuxp/workspacebuilder.py

@@ -365,6 +365,7 @@ def get_pane_shell():
 
             enter = pconf.get("enter", True)
             sleep = pconf.get("sleep", None)
+            print(pconf)
             for cmd in pconf["shell_command"]:
                 if sleep is not None:
                     time.sleep(sleep)