jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small code improvements fibaro integration (#87949)

Browse Source
This commit is contained in:
rappenze 2023-02-12 19:56:02 +01:00 committed by GitHub
parent 728f62b1ec
commit 69dc50c917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
homeassistant/components/fibaro/__init__.py
View File

@ -129,16 +129,13 @@ CONFIG_SCHEMA = vol.Schema(
class FibaroController: class FibaroController:
"""Initiate Fibaro Controller Class.""" """Initiate Fibaro Controller Class."""
def __init__( def __init__(self, config: Mapping[str, Any]) -> None:
self, config: Mapping[str, Any], serial_number: str | None = None
) -> None:
"""Initialize the Fibaro controller.""" """Initialize the Fibaro controller."""
# The FibaroClient uses the correct API version automatically # The FibaroClient uses the correct API version automatically
self._client = FibaroClient(config[CONF_URL]) self._client = FibaroClient(config[CONF_URL])
self._client.set_authentication(config[CONF_USERNAME], config[CONF_PASSWORD]) self._client.set_authentication(config[CONF_USERNAME], config[CONF_PASSWORD])
self._scene_map = None
# Whether to import devices from plugins # Whether to import devices from plugins
self._import_plugins = config[CONF_IMPORT_PLUGINS] self._import_plugins = config[CONF_IMPORT_PLUGINS]
self._room_map = None # Mapping roomId to room object self._room_map = None # Mapping roomId to room object
@ -156,15 +153,13 @@ class FibaroController:
def connect(self): def connect(self):
"""Start the communication with the Fibaro controller.""" """Start the communication with the Fibaro controller."""
try:
connected = self._client.connect() connected = self._client.connect()
info = self._client.read_info() info = self._client.read_info()
self.hub_serial = info.serial_number self.hub_serial = info.serial_number
self.hub_name = info.hc_name self.hub_name = info.hc_name
self.hub_software_version = info.current_version self.hub_software_version = info.current_version
except AssertionError:
_LOGGER.error("Can't connect to Fibaro HC. Please check URL")
return False
if connected is False: if connected is False:
_LOGGER.error( _LOGGER.error(
"Invalid login for Fibaro HC. Please check username and password" "Invalid login for Fibaro HC. Please check username and password"
@ -317,7 +312,7 @@ class FibaroController:
if "zwaveCompany" in master_entity.properties: if "zwaveCompany" in master_entity.properties:
manufacturer = master_entity.properties.get("zwaveCompany") manufacturer = master_entity.properties.get("zwaveCompany")
else: else:
manufacturer = "Unknown" manufacturer = None
self._device_infos[master_entity.fibaro_id] = DeviceInfo( self._device_infos[master_entity.fibaro_id] = DeviceInfo(
identifiers={(DOMAIN, master_entity.fibaro_id)}, identifiers={(DOMAIN, master_entity.fibaro_id)},
@ -336,7 +331,6 @@ class FibaroController:
def _read_scenes(self): def _read_scenes(self):
scenes = self._client.read_scenes() scenes = self._client.read_scenes()
self._scene_map = {}
for device in scenes: for device in scenes:
device.fibaro_controller = self device.fibaro_controller = self
if device.room_id == 0: if device.room_id == 0:
@ -351,7 +345,6 @@ class FibaroController:
device.unique_id_str = ( device.unique_id_str = (
f"{slugify(self.hub_serial)}.scene.{device.fibaro_id}" f"{slugify(self.hub_serial)}.scene.{device.fibaro_id}"
) )
self._scene_map[device.fibaro_id] = device
self.fibaro_devices[Platform.SCENE].append(device) self.fibaro_devices[Platform.SCENE].append(device)
_LOGGER.debug("%s scene -> %s", device.ha_id, device) _LOGGER.debug("%s scene -> %s", device.ha_id, device)
@ -451,11 +444,9 @@ async def async_setup(hass: HomeAssistant, base_config: ConfigType) -> bool:
return True return True
def _init_controller( def _init_controller(data: Mapping[str, Any]) -> FibaroController:
data: Mapping[str, Any], serial_number: str | None
) -> FibaroController:
"""Validate the user input allows us to connect to fibaro.""" """Validate the user input allows us to connect to fibaro."""
controller = FibaroController(data, serial_number) controller = FibaroController(data)
controller.connect_with_error_handling() controller.connect_with_error_handling()
return controller return controller
@ -466,9 +457,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
The unique id of the config entry is the serial number of the home center. The unique id of the config entry is the serial number of the home center.
""" """
try: try:
controller = await hass.async_add_executor_job( controller = await hass.async_add_executor_job(_init_controller, entry.data)
_init_controller, entry.data, entry.unique_id
)
except FibaroConnectFailed as connect_ex: except FibaroConnectFailed as connect_ex:
raise ConfigEntryNotReady( raise ConfigEntryNotReady(
f"Could not connect to controller at {entry.data[CONF_URL]}" f"Could not connect to controller at {entry.data[CONF_URL]}"