From 654a86b2abafae60fa2e7712ade9f2bfa96d47df Mon Sep 17 00:00:00 2001
From: onyx-and-iris <code@onyxandiris.online>
Date: Tue, 22 Aug 2023 16:11:24 +0100
Subject: [PATCH] move layout construction into builder class

separates construction from app representation
---
 src/nvda_voicemeeter/builder.py | 66 +++++++++++++++++++++++++++++++++
 src/nvda_voicemeeter/window.py  | 61 +++---------------------------
 2 files changed, 72 insertions(+), 55 deletions(-)
 create mode 100644 src/nvda_voicemeeter/builder.py

diff --git a/src/nvda_voicemeeter/builder.py b/src/nvda_voicemeeter/builder.py
new file mode 100644
index 0000000..731556b
--- /dev/null
+++ b/src/nvda_voicemeeter/builder.py
@@ -0,0 +1,66 @@
+import PySimpleGUI as psg
+
+
+class Builder:
+    """Responsible for building the Window layout"""
+
+    def __init__(self, window, vm):
+        self.window = window
+        self.vm = vm
+        self.kind = self.vm.kind
+
+    def run(self) -> list:
+        row0 = self.make_row0()
+        row1 = self.make_row1()
+        return [[row0], [row1]]
+
+    def make_row0(self):
+        def add_physical_device_opts(layout):
+            devices = ["{type}: {name}".format(**self.vm.device.output(i)) for i in range(self.vm.device.outs)]
+            devices.append("Deselect Device")
+            layout.append(
+                [
+                    psg.Combo(
+                        devices,
+                        size=(22, 4),
+                        expand_x=True,
+                        enable_events=True,
+                        readonly=True,
+                        key=f"HARDWARE OUT||A{i}",
+                    )
+                    for i in range(1, self.kind.phys_out + 1)
+                ]
+            )
+
+        hardware_out = list()
+        [step(hardware_out) for step in (add_physical_device_opts,)]
+        return psg.Frame("Hardware Out", hardware_out)
+
+    def make_row1(self):
+        def add_asio_checkboxes(layout, i):
+            nums = list(range(99))
+            layout.append(
+                [psg.Spin(nums, initial_value=0, size=2, enable_events=True, key=f"ASIO CHECKBOX||IN{i} 0")],
+            )
+            layout.append(
+                [psg.Spin(nums, initial_value=0, size=2, enable_events=True, key=f"ASIO CHECKBOX||IN{i} 1")],
+            )
+
+        inner = list()
+        asio_checkboxes_in1, asio_checkboxes_in2, asio_checkboxes_in3, asio_checkboxes_in4, asio_checkboxes_in5 = (
+            [] for _ in range(5)
+        )
+        for i, checkbox_list in enumerate(
+            (
+                asio_checkboxes_in1,
+                asio_checkboxes_in2,
+                asio_checkboxes_in3,
+                asio_checkboxes_in4,
+                asio_checkboxes_in5,
+            )
+        ):
+            [step(checkbox_list, i + 1) for step in (add_asio_checkboxes,)]
+            inner.append(psg.Frame(f"In#{i + 1}", checkbox_list))
+
+        asio_checkboxes = [inner]
+        return psg.Frame("PATCH ASIO Inputs to Strips", asio_checkboxes)
diff --git a/src/nvda_voicemeeter/window.py b/src/nvda_voicemeeter/window.py
index 4e46a51..e589169 100644
--- a/src/nvda_voicemeeter/window.py
+++ b/src/nvda_voicemeeter/window.py
@@ -2,6 +2,7 @@ import logging
 
 import PySimpleGUI as psg
 
+from .builder import Builder
 from .models import _make_cache
 from .nvda import Nvda
 from .parser import Parser
@@ -10,14 +11,18 @@ logger = logging.getLogger(__name__)
 
 
 class Window(psg.Window):
+    """Represents the main window of the application"""
+
     def __init__(self, title, vm):
         self.vm = vm
         self.kind = self.vm.kind
-        super().__init__(title, self.make_layout(), finalize=True)
         self.logger = logger.getChild(type(self).__name__)
         self.cache = _make_cache(self.vm)
         self.nvda = Nvda()
         self.parser = Parser()
+        self.builder = Builder(self, self.vm)
+        layout = self.builder.run()
+        super().__init__(title, layout, finalize=True)
         self.register_events()
 
     def __enter__(self):
@@ -26,60 +31,6 @@ class Window(psg.Window):
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
 
-    def make_layout(self) -> list:
-        """Builds the window layout step by step"""
-
-        def add_physical_device_opts(layout):
-            devices = ["{type}: {name}".format(**self.vm.device.output(i)) for i in range(self.vm.device.outs)]
-            devices.append("Deselect Device")
-            layout.append(
-                [
-                    psg.Combo(
-                        devices,
-                        size=(22, 4),
-                        expand_x=True,
-                        enable_events=True,
-                        readonly=True,
-                        key=f"HARDWARE OUT||A{i}",
-                    )
-                    for i in range(1, self.kind.phys_out + 1)
-                ]
-            )
-
-        def add_asio_checkboxes(layout, i):
-            data = list(range(99))
-            layout.append(
-                [psg.Spin(data, initial_value=0, size=2, enable_events=True, key=f"ASIO CHECKBOX||IN{i} 0")],
-            )
-            layout.append(
-                [psg.Spin(data, initial_value=0, size=2, enable_events=True, key=f"ASIO CHECKBOX||IN{i} 1")],
-            )
-
-        hardware_out = list()
-        [step(hardware_out) for step in (add_physical_device_opts,)]
-        row0 = psg.Frame("Hardware Out", hardware_out)
-
-        inner = list()
-        asio_checkboxes_in1, asio_checkboxes_in2, asio_checkboxes_in3, asio_checkboxes_in4, asio_checkboxes_in5 = (
-            [] for _ in range(5)
-        )
-        for i, checkbox_list in enumerate(
-            (
-                asio_checkboxes_in1,
-                asio_checkboxes_in2,
-                asio_checkboxes_in3,
-                asio_checkboxes_in4,
-                asio_checkboxes_in5,
-            )
-        ):
-            [step(checkbox_list, i + 1) for step in (add_asio_checkboxes,)]
-            inner.append(psg.Frame(f"In#{i + 1}", checkbox_list))
-
-        asio_checkboxes = [inner]
-        row1 = psg.Frame("PATCH ASIO Inputs to Strips", asio_checkboxes)
-
-        return [[row0], [row1]]
-
     def register_events(self):
         for i in range(1, self.vm.kind.phys_out + 1):
             self[f"HARDWARE OUT||A{i}"].bind("<FocusIn>", "||FOCUS IN")