Merge branch 'dev' of ssh://github.com/onyx-and-iris/voicemeeter-api-python into dev

Bump pytest from 8.3.4 to 9.0.3

poetry.lock

@@ -145,6 +145,21 @@ files = [
     {file = "pyenv_inspect-0.4.0-py3-none-any.whl", hash = "sha256:618683ae7d3e6db14778d58aa0fc6b3170180d944669b5d35a8aa4fb7db550d2"},
 ]
 
+[[package]]
+name = "pygments"
+version = "2.20.0"
+description = "Pygments is a syntax highlighting package written in Python."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176"},
+    {file = "pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f"},
+]
+
+[package.extras]
+windows-terminal = ["colorama (>=0.4.6)"]
+
 [[package]]
 name = "pyproject-api"
 version = "1.8.0"
@@ -167,26 +182,27 @@ testing = ["covdefaults (>=2.3)", "pytest (>=8.3.3)", "pytest-cov (>=5)", "pytes
 
 [[package]]
 name = "pytest"
-version = "8.3.4"
+version = "9.0.3"
 description = "pytest: simple powerful testing with Python"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.10"
 groups = ["dev"]
 files = [
-    {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"},
+    {file = "pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9"},
-    {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"},
+    {file = "pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c"},
 ]
 
 [package.dependencies]
-colorama = {version = "*", markers = "sys_platform == \"win32\""}
+colorama = {version = ">=0.4", markers = "sys_platform == \"win32\""}
-exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""}
+exceptiongroup = {version = ">=1", markers = "python_version < \"3.11\""}
-iniconfig = "*"
+iniconfig = ">=1.0.1"
-packaging = "*"
+packaging = ">=22"
 pluggy = ">=1.5,<2"
+pygments = ">=2.7.2"
 tomli = {version = ">=1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
+dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "requests", "setuptools", "xmlschema"]
 
 [[package]]
 name = "pytest-randomly"
@@ -356,4 +372,4 @@ virtualenv = "*"
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10"
-content-hash = "6339967c3f6cad8e4db7047ef3d12a5b059a279d0f7c98515c961477680bab8f"
+content-hash = "0eb05efe6d583f24454e3a0d3b2b3cc8b0a9c5a7a816ffa1471eb9e2655e2246"

pyproject.toml

@@ -15,7 +15,7 @@ packages = [{ include = "voicemeeterlib" }]
 poethepoet = ">=0.42.0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.3.4"
+pytest = "^9.0.3"
 pytest-randomly = "^3.16.0"
 ruff = "^0.8.6"
 tox = "^4.23.2"

voicemeeterlib/factory.py

@@ -1,5 +1,4 @@
 import logging
-from enum import IntEnum
 from functools import cached_property
 from typing import Iterable
 
@@ -9,7 +8,7 @@ from .command import Command
 from .config import request_config as configs
 from .device import Device
 from .error import VMError
-from .kinds import KindMapClass
+from .kinds import KindId, KindMapClass
 from .kinds import request_kind_map as kindmap
 from .macrobutton import MacroButton
 from .recorder import Recorder
@@ -27,34 +26,11 @@ class FactoryBuilder:
     Separates construction from representation.
     """
 
-    BuilderProgress = IntEnum(
-        'BuilderProgress',
-        'strip bus command macrobutton vban device option recorder patch fx',
-        start=0,
-    )
-
     def __init__(self, factory, kind: KindMapClass):
         self._factory = factory
         self.kind = kind
-        self._info = (
-            f'Finished building strips for {self._factory}',
-            f'Finished building buses for {self._factory}',
-            f'Finished building commands for {self._factory}',
-            f'Finished building macrobuttons for {self._factory}',
-            f'Finished building vban in/out streams for {self._factory}',
-            f'Finished building device for {self._factory}',
-            f'Finished building option for {self._factory}',
-            f'Finished building recorder for {self._factory}',
-            f'Finished building patch for {self._factory}',
-            f'Finished building fx for {self._factory}',
-        )
         self.logger = logger.getChild(self.__class__.__name__)
 
-    def _pinfo(self, name: str) -> None:
-        """prints progress status for each step"""
-        name = name.split('_')[1]
-        self.logger.debug(self._info[int(getattr(self.BuilderProgress, name))])
-
     def make_strip(self):
         self._factory.strip = tuple(
             strip(i < self.kind.phys_in, self._factory, i)
@@ -151,12 +127,14 @@ class BasicFactory(FactoryBase):
 
     def __new__(cls, *args, **kwargs):
         if cls is BasicFactory:
-            raise TypeError(f"'{cls.__name__}' does not support direct instantiation")
+            ERR_MSG = f"'{cls.__name__}' does not support direct instantiation"
+            raise TypeError(ERR_MSG)
         return object.__new__(cls)
 
     def __init__(self, kind_id, **kwargs):
         super().__init__(kind_id, **kwargs)
-        [step()._pinfo(step.__name__) for step in self.steps]
+        for step in self.steps:
+            step()
 
     @property
     def steps(self) -> Iterable:
@@ -173,12 +151,14 @@ class BananaFactory(FactoryBase):
 
     def __new__(cls, *args, **kwargs):
         if cls is BananaFactory:
-            raise TypeError(f"'{cls.__name__}' does not support direct instantiation")
+            ERR_MSG = f"'{cls.__name__}' does not support direct instantiation"
+            raise TypeError(ERR_MSG)
         return object.__new__(cls)
 
     def __init__(self, kind_id, **kwargs):
         super().__init__(kind_id, **kwargs)
-        [step()._pinfo(step.__name__) for step in self.steps]
+        for step in self.steps:
+            step()
 
     @property
     def steps(self) -> Iterable:
@@ -195,12 +175,14 @@ class PotatoFactory(FactoryBase):
 
     def __new__(cls, *args, **kwargs):
         if cls is PotatoFactory:
-            raise TypeError(f"'{cls.__name__}' does not support direct instantiation")
+            ERR_MSG = f"'{cls.__name__}' does not support direct instantiation"
+            raise TypeError(ERR_MSG)
         return object.__new__(cls)
 
     def __init__(self, kind_id: str, **kwargs):
         super().__init__(kind_id, **kwargs)
-        [step()._pinfo(step.__name__) for step in self.steps]
+        for step in self.steps:
+            step()
 
     @property
     def steps(self) -> Iterable:
@@ -226,7 +208,8 @@ def remote_factory(kind_id: str, **kwargs) -> Remote:
         case 'potato':
             _factory = PotatoFactory
         case _:
-            raise ValueError(f"Unknown Voicemeeter kind '{kind_id}'")
+            ERR_MSG = f'Unknown Voicemeeter kind {kind_id}, expected one of {[k.name.lower() for k in KindId]}'
+            raise ValueError(ERR_MSG)
     return type(f'Remote{kind_id.capitalize()}', (_factory,), {})(kind_id, **kwargs)
 
 
@@ -243,6 +226,6 @@ def request_remote_obj(kind_id: str, **kwargs) -> Remote:
     try:
         REMOTE_obj = remote_factory(kind_id, **kwargs)
     except (ValueError, TypeError) as e:
-        logger_entry.exception(f'{type(e).__name__}: {e}')
+        logger_entry.error(f'{type(e).__name__}: {e}')
         raise VMError(str(e)) from e
     return REMOTE_obj

voicemeeterlib/inst.py

@@ -1,15 +1,22 @@
 import ctypes as ct
 import platform
-import winreg
 from pathlib import Path
 
-from .error import InstallError
+from .error import InstallError, VMError
+
+try:
+    import winreg
+except ImportError as e:
+    ERR_MSG = 'winreg module not found, only Windows OS supported'
+    raise VMError(ERR_MSG) from e
+
+# Defense against edge cases where winreg imports but we're not on Windows
+if platform.system() != 'Windows':
+    ERR_MSG = f'Unsupported OS: {platform.system()}, only Windows OS supported'
+    raise VMError(ERR_MSG)
 
 BITS = 64 if ct.sizeof(ct.c_void_p) == 8 else 32
 
-if platform.system() != 'Windows':
-    raise InstallError('Only Windows OS supported')
-
 
 VM_KEY = 'VB:Voicemeeter {17359A74-1236-5467}'
 REG_KEY = '\\'.join(
@@ -37,12 +44,14 @@ def get_vmpath():
 try:
     vm_parent = Path(get_vmpath()).parent
 except FileNotFoundError as e:
-    raise InstallError('Unable to fetch DLL path from the registry') from e
+    ERR_MSG = 'Unable to fetch DLL path from the registry'
+    raise InstallError(ERR_MSG) from e
 
 DLL_NAME = f'VoicemeeterRemote{"64" if BITS == 64 else ""}.dll'
 
 dll_path = vm_parent.joinpath(DLL_NAME)
 if not dll_path.is_file():
-    raise InstallError(f'Could not find {dll_path}')
+    ERR_MSG = f'Could not find {dll_path}'
+    raise InstallError(ERR_MSG)
 
-libc = ct.CDLL(str(dll_path))
+libc = ct.WinDLL(str(dll_path))

voicemeeterlib/subject.py

@@ -7,7 +7,7 @@ class Subject:
     def __init__(self):
         """Adds support for observers and callbacks"""
 
-        self._observers = list()
+        self._observers = []
         self.logger = logger.getChild(self.__class__.__name__)
 
     @property
@@ -34,15 +34,13 @@ class Subject:
             for o in iterator:
                 if o not in self._observers:
                     self._observers.append(o)
-                    self.logger.info(f'{o} added to event observers')
                 else:
-                    self.logger.error(f'Failed to add {o} to event observers')
+                    self.logger.debug(f'Observer {o} already in observers list')
         except TypeError:
             if observer not in self._observers:
                 self._observers.append(observer)
-                self.logger.info(f'{observer} added to event observers')
             else:
-                self.logger.error(f'Failed to add {observer} to event observers')
+                self.logger.debug(f'Observer {observer} already in observers list')
 
     register = add
 
@@ -54,15 +52,13 @@ class Subject:
             for o in iterator:
                 try:
                     self._observers.remove(o)
-                    self.logger.info(f'{o} removed from event observers')
                 except ValueError:
-                    self.logger.error(f'Failed to remove {o} from event observers')
+                    self.logger.debug(f'Observer {o} not found in observers list')
         except TypeError:
             try:
                 self._observers.remove(observer)
-                self.logger.info(f'{observer} removed from event observers')
             except ValueError:
-                self.logger.error(f'Failed to remove {observer} from event observers')
+                self.logger.debug(f'Observer {observer} not found in observers list')
 
     deregister = remove