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

Clean up integration sensor (#98552)

Browse source 
always update
This commit is contained in:
Diogo Gomes 2023-08-18 19:45:12 +01:00 • committed by GitHub
parent 268e5244f0
commit f96446cb24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
homeassistant/components/integration/sensor.py
View file

@ -298,17 +298,13 @@ class IntegrationSensor(RestoreSensor):
old_state = event.data["old_state"] old_state = event.data["old_state"]
new_state = event.data["new_state"] new_state = event.data["new_state"]
# We may want to update our state before an early return,
# based on the source sensor's unit_of_measurement
# or device_class.
update_state = False
if ( if (
source_state := self.hass.states.get(self._sensor_source_id) source_state := self.hass.states.get(self._sensor_source_id)
) is None or source_state.state == STATE_UNAVAILABLE: ) is None or source_state.state == STATE_UNAVAILABLE:
self._attr_available = False self._attr_available = False
update_state = True self.async_write_ha_state()
else: return
self._attr_available = True self._attr_available = True
if old_state is None or new_state is None: if old_state is None or new_state is None:
@ -317,10 +313,7 @@ class IntegrationSensor(RestoreSensor):
unit = new_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) unit = new_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
if unit is not None: if unit is not None:
new_unit_of_measurement = self._unit(unit) self._unit_of_measurement = self._unit(unit)
if self._unit_of_measurement != new_unit_of_measurement:
self._unit_of_measurement = new_unit_of_measurement
update_state = True
if ( if (
self.device_class is None self.device_class is None
@ -329,9 +322,7 @@ class IntegrationSensor(RestoreSensor):
): ):
self._attr_device_class = SensorDeviceClass.ENERGY self._attr_device_class = SensorDeviceClass.ENERGY
self._attr_icon = None self._attr_icon = None
update_state = True
if update_state:
self.async_write_ha_state() self.async_write_ha_state()
try: try: