mirror of
https://github.com/onyx-and-iris/vban-cmd-python.git
synced 2026-05-12 06:23:31 +00:00
Compare commits
4 Commits
v2.10.4
...
84990367bd
| Author | SHA1 | Date | |
|---|---|---|---|
| 84990367bd | |||
| 5aae5dcba6 | |||
| a34beca205 | |||
|
|
c364db503b |
36
poetry.lock
generated
36
poetry.lock
generated
@@ -145,6 +145,21 @@ files = [
|
|||||||
{file = "pyenv_inspect-0.4.0-py3-none-any.whl", hash = "sha256:618683ae7d3e6db14778d58aa0fc6b3170180d944669b5d35a8aa4fb7db550d2"},
|
{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]]
|
[[package]]
|
||||||
name = "pyproject-api"
|
name = "pyproject-api"
|
||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
@@ -167,26 +182,27 @@ testing = ["covdefaults (>=2.3)", "pytest (>=8.3.3)", "pytest-cov (>=5)", "pytes
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pytest"
|
name = "pytest"
|
||||||
version = "8.3.4"
|
version = "9.0.3"
|
||||||
description = "pytest: simple powerful testing with Python"
|
description = "pytest: simple powerful testing with Python"
|
||||||
optional = false
|
optional = false
|
||||||
python-versions = ">=3.8"
|
python-versions = ">=3.10"
|
||||||
groups = ["dev"]
|
groups = ["dev"]
|
||||||
files = [
|
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]
|
[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"
|
pluggy = ">=1.5,<2"
|
||||||
|
pygments = ">=2.7.2"
|
||||||
tomli = {version = ">=1", markers = "python_version < \"3.11\""}
|
tomli = {version = ">=1", markers = "python_version < \"3.11\""}
|
||||||
|
|
||||||
[package.extras]
|
[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]]
|
[[package]]
|
||||||
name = "pytest-randomly"
|
name = "pytest-randomly"
|
||||||
@@ -356,4 +372,4 @@ virtualenv = "*"
|
|||||||
[metadata]
|
[metadata]
|
||||||
lock-version = "2.1"
|
lock-version = "2.1"
|
||||||
python-versions = ">=3.10"
|
python-versions = ">=3.10"
|
||||||
content-hash = "13fc9d0eb15d5fc09b54c1c8cd8f528b260259e97ee6813b50ab4724c35d6677"
|
content-hash = "7aa2f3723fd492542331618b2f2b891d8cff630f6984e19fd4c715d269533a46"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ dependencies = ["tomli (>=2.0.1,<3.0) ; python_version < '3.11'"]
|
|||||||
poethepoet = ">=0.42.0"
|
poethepoet = ">=0.42.0"
|
||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
[tool.poetry.group.dev.dependencies]
|
||||||
pytest = "^8.3.4"
|
pytest = "^9.0.3"
|
||||||
pytest-randomly = "^3.16.0"
|
pytest-randomly = "^3.16.0"
|
||||||
ruff = "^0.9.2"
|
ruff = "^0.9.2"
|
||||||
tox = "^4.23.2"
|
tox = "^4.23.2"
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import logging
|
import logging
|
||||||
from enum import IntEnum
|
|
||||||
from functools import cached_property
|
from functools import cached_property
|
||||||
from typing import Iterable
|
from typing import Iterable
|
||||||
|
|
||||||
from .bus import request_bus_obj as bus
|
from .bus import request_bus_obj as bus
|
||||||
from .command import Command
|
from .command import Command
|
||||||
from .config import request_config as configs
|
from .config import request_config as configs
|
||||||
|
from .enums import KindId
|
||||||
from .error import VBANCMDError
|
from .error import VBANCMDError
|
||||||
from .kinds import KindMapClass
|
from .kinds import KindMapClass
|
||||||
from .kinds import request_kind_map as kindmap
|
from .kinds import request_kind_map as kindmap
|
||||||
@@ -25,28 +25,11 @@ class FactoryBuilder:
|
|||||||
Separates construction from representation.
|
Separates construction from representation.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
BuilderProgress = IntEnum(
|
|
||||||
'BuilderProgress', 'strip bus command macrobutton vban recorder', start=0
|
|
||||||
)
|
|
||||||
|
|
||||||
def __init__(self, factory, kind: KindMapClass):
|
def __init__(self, factory, kind: KindMapClass):
|
||||||
self._factory = factory
|
self._factory = factory
|
||||||
self.kind = kind
|
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 recorder for {self._factory}',
|
|
||||||
)
|
|
||||||
self.logger = logger.getChild(self.__class__.__name__)
|
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):
|
def make_strip(self):
|
||||||
self._factory.strip = tuple(
|
self._factory.strip = tuple(
|
||||||
strip(i < self.kind.phys_in, self._factory, i)
|
strip(i < self.kind.phys_in, self._factory, i)
|
||||||
@@ -136,12 +119,14 @@ class BasicFactory(FactoryBase):
|
|||||||
|
|
||||||
def __new__(cls, *args, **kwargs):
|
def __new__(cls, *args, **kwargs):
|
||||||
if cls is BasicFactory:
|
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)
|
return object.__new__(cls)
|
||||||
|
|
||||||
def __init__(self, kind_id, **kwargs):
|
def __init__(self, kind_id, **kwargs):
|
||||||
super().__init__(kind_id, **kwargs)
|
super().__init__(kind_id, **kwargs)
|
||||||
[step()._pinfo(step.__name__) for step in self.steps]
|
for step in self.steps:
|
||||||
|
step()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def steps(self) -> Iterable:
|
def steps(self) -> Iterable:
|
||||||
@@ -158,12 +143,14 @@ class BananaFactory(FactoryBase):
|
|||||||
|
|
||||||
def __new__(cls, *args, **kwargs):
|
def __new__(cls, *args, **kwargs):
|
||||||
if cls is BananaFactory:
|
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)
|
return object.__new__(cls)
|
||||||
|
|
||||||
def __init__(self, kind_id, **kwargs):
|
def __init__(self, kind_id, **kwargs):
|
||||||
super().__init__(kind_id, **kwargs)
|
super().__init__(kind_id, **kwargs)
|
||||||
[step()._pinfo(step.__name__) for step in self.steps]
|
for step in self.steps:
|
||||||
|
step()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def steps(self) -> Iterable:
|
def steps(self) -> Iterable:
|
||||||
@@ -180,12 +167,14 @@ class PotatoFactory(FactoryBase):
|
|||||||
|
|
||||||
def __new__(cls, *args, **kwargs):
|
def __new__(cls, *args, **kwargs):
|
||||||
if cls is PotatoFactory:
|
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)
|
return object.__new__(cls)
|
||||||
|
|
||||||
def __init__(self, kind_id: str, **kwargs):
|
def __init__(self, kind_id: str, **kwargs):
|
||||||
super().__init__(kind_id, **kwargs)
|
super().__init__(kind_id, **kwargs)
|
||||||
[step()._pinfo(step.__name__) for step in self.steps]
|
for step in self.steps:
|
||||||
|
step()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def steps(self) -> Iterable:
|
def steps(self) -> Iterable:
|
||||||
@@ -213,7 +202,8 @@ def vbancmd_factory(kind_id: str, **kwargs) -> VbanCmd:
|
|||||||
kind_id = 'potato'
|
kind_id = 'potato'
|
||||||
_factory = PotatoFactory
|
_factory = PotatoFactory
|
||||||
case _:
|
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'VbanCmd{kind_id.capitalize()}', (_factory,), {})(kind_id, **kwargs)
|
return type(f'VbanCmd{kind_id.capitalize()}', (_factory,), {})(kind_id, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
@@ -229,6 +219,6 @@ def request_vbancmd_obj(kind_id: str, **kwargs) -> VbanCmd:
|
|||||||
try:
|
try:
|
||||||
VBANCMD_obj = vbancmd_factory(kind_id, **kwargs)
|
VBANCMD_obj = vbancmd_factory(kind_id, **kwargs)
|
||||||
except (ValueError, TypeError) as e:
|
except (ValueError, TypeError) as e:
|
||||||
logger_entry.exception(f'{type(e).__name__}: {e}')
|
logger_entry.error(f'{type(e).__name__}: {e}')
|
||||||
raise VBANCMDError(str(e)) from e
|
raise VBANCMDError(str(e)) from e
|
||||||
return VBANCMD_obj
|
return VBANCMD_obj
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ class Subject:
|
|||||||
def __init__(self):
|
def __init__(self):
|
||||||
"""Adds support for observers and callbacks"""
|
"""Adds support for observers and callbacks"""
|
||||||
|
|
||||||
self._observers = list()
|
self._observers = []
|
||||||
self.logger = logger.getChild(self.__class__.__name__)
|
self.logger = logger.getChild(self.__class__.__name__)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -34,15 +34,13 @@ class Subject:
|
|||||||
for o in iterator:
|
for o in iterator:
|
||||||
if o not in self._observers:
|
if o not in self._observers:
|
||||||
self._observers.append(o)
|
self._observers.append(o)
|
||||||
self.logger.info(f'{o} added to event observers')
|
|
||||||
else:
|
else:
|
||||||
self.logger.error(f'Failed to add {o} to event observers')
|
self.logger.debug(f'Failed to add {o} to event observers')
|
||||||
except TypeError:
|
except TypeError:
|
||||||
if observer not in self._observers:
|
if observer not in self._observers:
|
||||||
self._observers.append(observer)
|
self._observers.append(observer)
|
||||||
self.logger.info(f'{observer} added to event observers')
|
|
||||||
else:
|
else:
|
||||||
self.logger.error(f'Failed to add {observer} to event observers')
|
self.logger.debug(f'Failed to add {observer} to event observers')
|
||||||
|
|
||||||
register = add
|
register = add
|
||||||
|
|
||||||
@@ -54,15 +52,13 @@ class Subject:
|
|||||||
for o in iterator:
|
for o in iterator:
|
||||||
try:
|
try:
|
||||||
self._observers.remove(o)
|
self._observers.remove(o)
|
||||||
self.logger.info(f'{o} removed from event observers')
|
|
||||||
except ValueError:
|
except ValueError:
|
||||||
self.logger.error(f'Failed to remove {o} from event observers')
|
self.logger.debug(f'Failed to remove {o} from event observers')
|
||||||
except TypeError:
|
except TypeError:
|
||||||
try:
|
try:
|
||||||
self._observers.remove(observer)
|
self._observers.remove(observer)
|
||||||
self.logger.info(f'{observer} removed from event observers')
|
|
||||||
except ValueError:
|
except ValueError:
|
||||||
self.logger.error(f'Failed to remove {observer} from event observers')
|
self.logger.debug(f'Failed to remove {observer} from event observers')
|
||||||
|
|
||||||
deregister = remove
|
deregister = remove
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user