jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-08 01:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Pascal Vizeli 2018-04-13 22:04:01 +02:00
parent 0cca8f522b
commit 2f62b7046c
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hassio/const.py
View File

@ -162,8 +162,6 @@ ATTR_CRYPTO = 'crypto'
ATTR_BRANCH = 'branch' ATTR_BRANCH = 'branch'
ATTR_SECCOMP = 'seccomp' ATTR_SECCOMP = 'seccomp'
ATTR_APPARMOR = 'apparmor' ATTR_APPARMOR = 'apparmor'
ATTR_CACHE = 'cache'
ATTR_DEFAULT = 'default'
SERVICE_MQTT = 'mqtt' SERVICE_MQTT = 'mqtt'

38
hassio/host/alsa.py
View File

@ -5,8 +5,7 @@ import json
from pathlib import Path from pathlib import Path
from string import Template from string import Template
from ..const import ( from ..const import ATTR_INPUT, ATTR_OUTPUT, ATTR_DEVICES, ATTR_NAME
ATTR_CACHE, ATTR_INPUT, ATTR_OUTPUT, ATTR_DEVICES, ATTR_NAME, ATTR_DEFAULT)
from ..coresys import CoreSysAttributes from ..coresys import CoreSysAttributes
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -21,21 +20,22 @@ class AlsaAudio(CoreSysAttributes):
"""Initialize Alsa audio system.""" """Initialize Alsa audio system."""
self.coresys = coresys self.coresys = coresys
self._data = { self._data = {
ATTR_CACHE: 0,
ATTR_INPUT: {}, ATTR_INPUT: {},
ATTR_OUTPUT: {}, ATTR_OUTPUT: {},
} }
self._cache = 0
self._default = None
@property @property
def input_devices(self): def input_devices(self):
"""Return list of ALSA input devices.""" """Return list of ALSA input devices."""
self._update_device() #self._update_device()
return self._data[ATTR_INPUT] return self._data[ATTR_INPUT]
@property @property
def output_devices(self): def output_devices(self):
"""Return list of ALSA output devices.""" """Return list of ALSA output devices."""
self._update_device() #self._update_device()
return self._data[ATTR_OUTPUT] return self._data[ATTR_OUTPUT]
def _update_device(self): def _update_device(self):
@ -43,7 +43,7 @@ class AlsaAudio(CoreSysAttributes):
current_id = hash(frozenset(self._hardware.audio_devices)) current_id = hash(frozenset(self._hardware.audio_devices))
# Need rebuild? # Need rebuild?
if current_id == self._data[ATTR_CACHE]: if current_id == self._cache:
return return
# Init database # Init database
@ -65,7 +65,7 @@ class AlsaAudio(CoreSysAttributes):
self._data[key][alsa_id] = database.get(self._machine, {}).get( self._data[key][alsa_id] = database.get(self._machine, {}).get(
alsa_id, f"{dev_data[ATTR_NAME]}: {chan_id}") alsa_id, f"{dev_data[ATTR_NAME]}: {chan_id}")
self._data[ATTR_CACHE] = current_id self._cache = current_id
@staticmethod @staticmethod
def _audio_database(): def _audio_database():
@ -84,31 +84,25 @@ class AlsaAudio(CoreSysAttributes):
@property @property
def default(self): def default(self):
"""Generate ALSA default setting.""" """Generate ALSA default setting."""
if ATTR_DEFAULT in self._data:
default = self._data[ATTR_DEFAULT]
else:
default = None
# Init defaults # Init defaults
if default is None: if self._default is None:
database = self._audio_database() database = self._audio_database()
alsa_input = database.get(self._machine, {}).get(ATTR_INPUT) alsa_input = database.get(self._machine, {}).get(ATTR_INPUT)
alsa_output = database.get(self._machine, {}).get(ATTR_OUTPUT) alsa_output = database.get(self._machine, {}).get(ATTR_OUTPUT)
default = self._data[ATTR_DEFAULT] = \ self._default = DefaultConfig(alsa_input, alsa_output)
DefaultConfig(alsa_input, alsa_output)
# Search exists/new output # Search exists/new output
if default.output is None and self.output_devices: if self._default.output is None and self.output_devices:
default.output = next(iter(self.output_devices)) self._default.output = next(iter(self.output_devices))
_LOGGER.info("Detect output device %s", default.output) _LOGGER.info("Detect output device %s", self._default.output)
# Search exists/new input # Search exists/new input
if default.input is None and self.input_devices: if self._default.input is None and self.input_devices:
default.input = next(iter(self.input_devices)) self._default.input = next(iter(self.input_devices))
_LOGGER.info("Detect input device %s", default.input) _LOGGER.info("Detect input device %s", self._default.input)
return default return self._default
def asound(self, alsa_input=None, alsa_output=None): def asound(self, alsa_input=None, alsa_output=None):
"""Generate a asound data.""" """Generate a asound data."""