2 Commits

Author SHA1 Message Date
84990367bd remove success add/remove to observers logs
log failure add/remove to observers at debug level.

This is all part of normal program flow.
2026-04-28 12:45:40 +01:00
5aae5dcba6 remove builder progress logs, they aren't very useful and we test the factories anyway. 2026-04-28 12:29:38 +01:00
2 changed files with 21 additions and 35 deletions

View File

@@ -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

View File

@@ -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