#33 rewrite pane iteration on config.expand().

Author: tony

tmuxp/config.py

@@ -11,6 +11,7 @@
 
 from __future__ import absolute_import, division, print_function, with_statement
 import os
+import copy
 import logging
 from . import exc
 from .util import basestring
@@ -198,50 +199,38 @@ def expand(sconf, cwd=None):
         ]
     elif 'panes' in sconf:
 
-        for p in sconf['panes']:
-            p_index = sconf['panes'].index(p)
+        for pconf in sconf['panes']:
+            p_index = sconf['panes'].index(pconf)
+            p = copy.deepcopy(pconf)
+            pconf = sconf['panes'][p_index] = {}
 
-            if not isinstance(p, dict) and not isinstance(p, list):
-                p = sconf['panes'][p_index] = {
+            if isinstance(p, basestring):
+                p = {
                     'shell_command': [p]
                 }
-
-            if isinstance(p, dict) and not len(p):
-                p = sconf['panes'][p_index] = {
+            elif not p:
+                p = {
                     'shell_command': []
                 }
 
-            if isinstance(p, basestring):
-
-                p = sconf['panes'][p_index] = {
-                    'shell_command': [p]
-                }
-
+            assert isinstance(p, dict)
+            assert 'shell_command' in p
             if 'shell_command' in p:
+                cmd = p['shell_command']
 
                 if isinstance(p['shell_command'], basestring):
-                    p = sconf['panes'][p_index] = {
-                        'shell_command': [p['shell_command']]
-                    }
-
-                if p['shell_command'] is None:
-                    p = sconf['panes'][p_index] = {
-                        'shell_command': []
-                    }
-                elif (
-                    isinstance(p['shell_command'], list) and (
-                        len(p['shell_command']) == int(1) and (
-                            any(
-                                a in p['shell_command']
-                                for a in [None, 'blank', 'pane']
-                            ) or p['shell_command'][0] is None
-                        )
-                    )
-                ):
-                    p = sconf['panes'][p_index] = {
-                        'shell_command': []
-                    }
+                    cmd = [cmd]
+
+                if not cmd or any(a == cmd for a in [None, 'blank', 'pane']):
+                    cmd = []
+
+                if isinstance(cmd, list) and len(cmd) == int(1):
+                    if any(a in cmd for a in [None, 'blank', 'pane']):
+                        cmd = []
+
+                p['shell_command'] = cmd
 
+            pconf.update(p)
         sconf['panes'] = [expand(pane) for pane in sconf['panes']]
 
     return sconf

tmuxp/testsuite/test_config.py

@@ -277,6 +277,91 @@ def test_config(self):
         test_config = config.expand(self.before_config)
         self.assertDictEqual(test_config, self.after_config)
 
+    def test_no_window_name(self):
+        """Expand shell commands from string to list."""
+
+        unexpanded_yaml = """
+        session_name: sampleconfig
+        start_directory: '~'
+        windows:
+        - window_name: focused window
+          layout: main-horizontal
+          focus: true
+          panes:
+          - shell_command:
+            - cd ~
+          - shell_command:
+            - cd /usr
+            focus: true
+          - shell_command:
+            - cd ~
+            - echo "moo"
+            - top
+        - window_name: window 2
+          panes:
+          - shell_command:
+            - top
+            focus: true
+          - shell_command:
+            - echo "hey"
+          - shell_command:
+            - echo "moo"
+          - window_name: window 3
+          panes:
+          - shell_command: cd /
+            focus: true
+          - pane
+          - pane
+        """
+
+        expanded_yaml = """
+        session_name: sampleconfig
+        start_directory: '~'
+        windows:
+        - window_name: focused window
+          layout: main-horizontal
+          focus: true
+          panes:
+          - shell_command:
+            - cd ~
+          - shell_command:
+            - cd /usr
+            focus: true
+          - shell_command:
+            - cd ~
+            - echo "moo"
+            - top
+        - window_name: window 2
+          panes:
+          - shell_command:
+            - top
+            focus: true
+          - shell_command:
+            - echo "hey"
+          - shell_command:
+            - echo "moo"
+          - window_name: window 3
+          panes:
+          - shell_command:
+            - cd /
+            focus: true
+          - shell_command: []
+          - shell_command: []
+        """
+
+        self.maxDiff = None
+
+        unexpanded_dict = kaptan.Kaptan(handler='yaml'). \
+            import_config(unexpanded_yaml).get()
+
+        expanded_dict = kaptan.Kaptan(handler='yaml'). \
+            import_config(expanded_yaml).get()
+
+        self.assertDictEqual(
+            config.expand(unexpanded_dict),
+            expanded_dict
+        )
+
 
 class InlineTest(TestCase):
 

tmuxp/testsuite/test_workspacebuilder.py

@@ -133,18 +133,25 @@ class FocusAndPaneIndexTest(TmuxTestCase):
       panes:
       - shell_command:
         - top
-        1ocus: true
+        focus: true
       - shell_command:
         - echo "hey"
       - shell_command:
         - echo "moo"
-
+    - window_name: window 3
+      panes:
+      - shell_command: cd /
+        focus: true
+      - pane
+      - pane
     """
 
-    def test_split_windows(self):
+    def test_focus_pane_index(self):
         s = self.session
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(self.yaml_config).get()
+        sconfig = config.expand(sconfig)
+        sconfig = config.trickle(sconfig)
 
         builder = WorkspaceBuilder(sconf=sconfig)
 
@@ -186,6 +193,26 @@ def test_split_windows(self):
 
         self.assertEqual(p.get('pane_current_path'), pane_path)
 
+        proc = self.session.tmux('show-option', '-gv', 'base-index')
+        base_index = int(proc.stdout[0])
+        self.session.server._update_windows()
+        for w in self.session._windows:
+            logger.error(w['window_index'])
+
+        window3 = self.session.findWhere({'window_index': str(base_index + 2)})
+        self.assertIsInstance(window3, Window)
+
+        p = None
+        pane_path = '/'
+        for i in range(60):
+            p = window3.attached_pane()
+            p.server._update_panes()
+            if p.get('pane_current_path') == pane_path:
+                break
+            time.sleep(.2)
+
+        self.assertEqual(p.get('pane_current_path'), pane_path)
+
 
 class WindowOptions(TmuxTestCase):