Added unified parsing

catmux/session.py

@@ -28,6 +28,7 @@
 import libtmux
 import yaml
 
+from catmux.utils import parse_commands
 from catmux.window import Window
 import catmux.exceptions as cme
 
@@ -101,7 +102,7 @@
         if "common" in self.__yaml_data and self.__yaml_data["common"]:
             common = self.__yaml_data["common"]
             if "before_commands" in common and common["before_commands"]:
-                self._before_commands = common["before_commands"]
+                self._before_commands = parse_commands(common, "before_commands")
 
             if "default_window" in common and common["default_window"]:
                 self._default_window = common["default_window"]

catmux/split.py

@@ -27,17 +27,19 @@
 
 import libtmux
 
+from catmux.utils import parse_commands
+
 
 class Split(object):
 
     """A split is a pane where commands can be executed"""
 
-    def __init__(self, **kwargs):
+    def __init__(self, commands):
         """TODO: to be defined1."""
+        self.commands = list()
 
-        if kwargs is not None:
-            for (key, value) in kwargs.items():
-                setattr(self, key, value)
+        if commands is not None:
+            self.commands = commands
 
     def debug(self, name="", prefix=""):
         """Prints all information about this window"""
@@ -48,5 +50,5 @@
 
     def run(self, parent_pane: libtmux.Pane):
         "Executes all configured commands" ""
-        for command in getattr(self, "commands"):
+        for command in self.commands:
             parent_pane.send_keys(command)

catmux/utils.py

@@ -0,0 +1,30 @@
+# -- BEGIN LICENSE BLOCK ----------------------------------------------
+
+# catmux
+# Copyright (C) 2025  Felix Exner
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# -- END LICENSE BLOCK ------------------------------------------------
+
+"""General utility functions for catmux"""
+
+
+def parse_commands(command_dict, key):
+    return command_dict[key]

catmux/window.py

@@ -30,6 +30,7 @@
 
 from catmux.split import Split
 from catmux.exceptions import InvalidConfig
+from catmux.utils import parse_commands
 
 
 class Window(object):
@@ -40,21 +41,23 @@
         """TODO: to be defined1."""
 
         split_list = kwargs.pop("splits", None)
-        if not split_list:
-            if "commands" in kwargs:
-                split_dict = dict()
-                split_dict["commands"] = kwargs.pop("commands")
-                split_list = [split_dict]
-            else:
-                raise InvalidConfig(
-                    f"No splits and no commands given for window '{kwargs['name']}'."
-                )
-
-        print(split_list)
+        split_command_list = list()
+        if split_list:
+            for split_data in split_list:
+                split_command_list.append(parse_commands(split_data, "commands"))
+        elif not split_list and "commands" in kwargs:
+            split_command_list.append(parse_commands(kwargs, "commands"))
+        else:
+            raise InvalidConfig(
+                f"No splits and no commands given for window '{kwargs['name']}'."
+            )
 
         self.splits = list()
-        for split_data in split_list:
-            self.splits.append(Split(**split_data))
+        for split_data in split_command_list:
+            if hasattr(split_data, "__iter__"):
+                self.splits.append(Split(split_data))
+            else:
+                print("Split is empty, dropping")
 
         if kwargs is not None:
             for (key, value) in kwargs.items():