evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename confusing device info in Roborock (#93843)

Browse source 
rename confusing device info
This commit is contained in:
Luke 2023-05-30 23:33:18 -04:00 • committed by GitHub
parent 23c5e60be0
commit 8244887bb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
homeassistant/components/roborock/coordinator.py
View file

@ -33,20 +33,20 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
) -> None: ) -> None:
"""Initialize.""" """Initialize."""
super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL) super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL)
self.device_info = RoborockHassDeviceInfo( self.roborock_device_info = RoborockHassDeviceInfo(
device, device,
device_networking, device_networking,
product_info, product_info,
DeviceProp(), DeviceProp(),
) )
device_info = DeviceData(device, product_info.model, device_networking.ip) device_data = DeviceData(device, product_info.model, device_networking.ip)
self.api = RoborockLocalClient(device_info) self.api = RoborockLocalClient(device_data)
self.device_specification = DeviceInfo( self.device_info = DeviceInfo(
name=self.device_info.device.name, name=self.roborock_device_info.device.name,
identifiers={(DOMAIN, self.device_info.device.duid)}, identifiers={(DOMAIN, self.roborock_device_info.device.duid)},
manufacturer="Roborock", manufacturer="Roborock",
model=self.device_info.product.model, model=self.roborock_device_info.product.model,
sw_version=self.device_info.device.fv, sw_version=self.roborock_device_info.device.fv,
) )
async def release(self) -> None: async def release(self) -> None:
@ -57,10 +57,10 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
"""Update device properties.""" """Update device properties."""
device_prop = await self.api.get_prop() device_prop = await self.api.get_prop()
if device_prop: if device_prop:
if self.device_info.props: if self.roborock_device_info.props:
self.device_info.props.update(device_prop) self.roborock_device_info.props.update(device_prop)
else: else:
self.device_info.props = device_prop self.roborock_device_info.props = device_prop
async def _async_update_data(self) -> DeviceProp: async def _async_update_data(self) -> DeviceProp:
"""Update data via library.""" """Update data via library."""
@ -68,4 +68,4 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
await self._update_device_prop() await self._update_device_prop()
except RoborockException as ex: except RoborockException as ex:
raise UpdateFailed(ex) from ex raise UpdateFailed(ex) from ex
return self.device_info.props return self.roborock_device_info.props

2
homeassistant/components/roborock/device.py
View file

@ -57,7 +57,7 @@ class RoborockCoordinatedEntity(
RoborockEntity.__init__( RoborockEntity.__init__(
self, self,
unique_id=unique_id, unique_id=unique_id,
device_info=coordinator.device_specification, device_info=coordinator.device_info,
api=coordinator.api, api=coordinator.api,
) )
CoordinatorEntity.__init__(self, coordinator=coordinator) CoordinatorEntity.__init__(self, coordinator=coordinator)

3
homeassistant/components/roborock/select.py
View file

@ -77,7 +77,8 @@ async def async_setup_entry(
) )
for device_id, coordinator in coordinators.items() for device_id, coordinator in coordinators.items()
for description in SELECT_DESCRIPTIONS for description in SELECT_DESCRIPTIONS
if description.options_lambda(coordinator.device_info.props.status) is not None if description.options_lambda(coordinator.roborock_device_info.props.status)
is not None
) )

4
homeassistant/components/roborock/sensor.py
View file

@ -140,4 +140,6 @@ class RoborockSensorEntity(RoborockCoordinatedEntity, SensorEntity):
@property @property
def native_value(self) -> StateType: def native_value(self) -> StateType:
"""Return the value reported by the sensor.""" """Return the value reported by the sensor."""
return self.entity_description.value_fn(self.coordinator.device_info.props) return self.entity_description.value_fn(
self.coordinator.roborock_device_info.props
)

2
homeassistant/components/roborock/switch.py
View file

@ -91,7 +91,7 @@ class RoborockSwitchEntity(RoborockEntity, SwitchEntity):
) -> None: ) -> None:
"""Create a switch entity.""" """Create a switch entity."""
self.entity_description = entity_description self.entity_description = entity_description
super().__init__(unique_id, coordinator.device_specification, coordinator.api) super().__init__(unique_id, coordinator.device_info, coordinator.api)
async def async_turn_off(self, **kwargs: Any) -> None: async def async_turn_off(self, **kwargs: Any) -> None:
"""Turn off the switch.""" """Turn off the switch."""