check vban direction

check that index is numeric

remove button as possible key.
not defined in RT packets anyway

patch bump

README.md

@@ -94,6 +94,7 @@ def main():
             {
                 "strip-2": {"A1": True, "B1": True, "gain": -6.0},
                 "bus-2": {"mute": True, "eq": {"on": True}},
+                "vban-in-0": {"on": True},
             }
         )
 
@@ -355,6 +356,7 @@ vban.apply(
         "strip-0": {"A1": True, "B1": True, "gain": -6.0},
         "bus-1": {"mute": True, "mode": "composite"},
         "bus-2": {"eq": {"on": True}},
+        "vban-in-0": {"on": True},
     }
 )
 ```

__main__.py

@@ -37,6 +37,7 @@ def main():
             {
                 "strip-2": {"A1": True, "B1": True, "gain": -6.0},
                 "bus-2": {"mute": True},
+                "vban-in-0": {"on": True},
             }
         )
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vban-cmd"
-version = "2.4.6"
+version = "2.4.8"
 description = "Python interface for the VBAN RT Packet Service (Sendtext)"
 authors = ["onyx-and-iris <code@onyxandiris.online>"]
 license = "MIT"
@@ -28,7 +28,10 @@ build-backend = "poetry.core.masonry.api"
 gui = "scripts:ex_gui"
 obs = "scripts:ex_obs"
 observer = "scripts:ex_observer"
-test = "scripts:test"
+basic = "scripts:test_basic"
+banana = "scripts:test_banana"
+potato = "scripts:test_potato"
+all = "scripts:test_all"
 
 [tool.tox]
 legacy_tox_ini = """

scripts.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -18,5 +19,21 @@ def ex_observer():
     subprocess.run([sys.executable, str(scriptpath)])
 
 
-def test():
+def test_basic():
+    os.environ["KIND"] = "basic"
     subprocess.run(["tox"])
+
+
+def test_banana():
+    os.environ["KIND"] = "banana"
+    subprocess.run(["tox"])
+
+
+def test_potato():
+    os.environ["KIND"] = "potato"
+    subprocess.run(["tox"])
+
+
+def test_all():
+    steps = [test_basic, test_banana, test_potato]
+    [step() for step in steps]

tests/__init__.py

@@ -1,3 +1,4 @@
+import os
 import random
 import sys
 from dataclasses import dataclass
@@ -6,8 +7,10 @@ import vban_cmd
 from vban_cmd.kinds import KindId
 from vban_cmd.kinds import request_kind_map as kindmap
 
-# let's keep things random
-KIND_ID = random.choice(tuple(kind_id.name.lower() for kind_id in KindId))
+# get KIND_ID from env var, otherwise set to random
+KIND_ID = os.environ.get(
+    "KIND", random.choice(tuple(kind_id.name.lower() for kind_id in KindId))
+)
 
 opts = {
     "ip": "testing.local",

tests/pre-commit.ps1

@@ -11,7 +11,7 @@ Function RunTests {
             $line | Tee-Object -FilePath $coverage -Append
         }
     }
-    Write-Output "$(Get-TimeStamp)" | Out-file $coverage -Append
+    Write-Output "$(Get-TimeStamp)" | Out-File $coverage -Append
 
     Invoke-Expression "genbadge tests -t 90 -i ./tests/.coverage.xml -o ./tests/$kind.svg"
 }
@@ -25,7 +25,10 @@ Function Get-TimeStamp {
 if ($MyInvocation.InvocationName -ne ".") {
     Invoke-Expression ".\.venv\Scripts\Activate.ps1"
 
-    RunTests
+    @("potato") | ForEach-Object {
+        $env:KIND = $_
+        RunTests        
+    }
 
     Invoke-Expression "deactivate"
 }

tests/test_errors.py

@@ -32,5 +32,5 @@ class TestErrors:
             "unknown-0": {"state": True},
             "vban-out-1": {"name": "streamname"},
         }
-        with pytest.raises(ValueError, match="invalid config key 'unknown'"):
+        with pytest.raises(ValueError, match="invalid config key 'unknown-0'"):
             vban.apply(CONFIG)

vban_cmd/vban.py

@@ -172,8 +172,8 @@ class VbanMidiOutstream(VbanOutstream):
 def _make_stream_pair(remote, kind):
     num_instream, num_outstream, num_midi, num_text = kind.vban
 
-    def _make_cls(i, dir):
-        match dir:
+    def _make_cls(i, direction):
+        match direction:
             case "in":
                 if i < num_instream:
                     return VbanAudioInstream(remote, i)

vban_cmd/vbancmd.py

@@ -183,17 +183,19 @@ class VbanCmd(metaclass=ABCMeta):
         """
 
         def target(key):
-            kls, m2, *rem = key.split("-")
-            match kls:
-                case "strip" | "bus" | "button":
-                    index = m2
+            match key.split("-"):
+                case ["strip" | "bus" as kls, index] if index.isnumeric():
                     target = getattr(self, kls)
-                case "vban":
-                    dir = f"{m2.rstrip('stream')}stream"
-                    index = rem[0]
-                    target = getattr(self.vban, dir)
+                case [
+                    "vban",
+                    "in" | "instream" | "out" | "outstream" as direction,
+                    index,
+                ] if index.isnumeric():
+                    target = getattr(
+                        self.vban, f"{direction.removesuffix('stream')}stream"
+                    )
                 case _:
-                    ERR_MSG = f"invalid config key '{kls}'"
+                    ERR_MSG = f"invalid config key '{key}'"
                     self.logger.error(ERR_MSG)
                     raise ValueError(ERR_MSG)
             return target[int(index)]
@@ -229,7 +231,8 @@ class VbanCmd(metaclass=ABCMeta):
         if not self.stopped():
             self.logger.debug("events thread shutdown started")
             self.stop_event.set()
-            self.subscriber.join()  # wait for subscriber thread to complete cycle
+            for t in (self.producer, self.subscriber):
+                t.join()
         [sock.close() for sock in self.socks]
         self.logger.info(f"{type(self).__name__}: Successfully logged out of {self}")