Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce Entity.async_write_ha_state() to not miss state transition #21590

Merged
merged 13 commits into from
Mar 9, 2019
Merged

Introduce Entity.async_write_ha_state() to not miss state transition #21590

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9db7b87
Copy state in schedule_update_ha_state
emontnemery Mar 2, 2019
1176f15
Lint
emontnemery Mar 2, 2019
8b5ea22
Fix broken test
emontnemery Mar 3, 2019
d6d5d76
Review comment, improve docstring
emontnemery Mar 4, 2019
260e3b0
Preserve order of state updates
emontnemery Mar 4, 2019
02ff5e7
Rewrite
emontnemery Mar 6, 2019
fc477bc
Break up async_update_ha_state
balloob Mar 7, 2019
c4b5789
Update binary_sensor.py
balloob Mar 7, 2019
9459170
Review comments
emontnemery Mar 7, 2019
cf641cd
Update docstring
emontnemery Mar 7, 2019
83bd8ae
hass -> ha
emontnemery Mar 7, 2019
a37f23b
Update entity.py
balloob Mar 7, 2019
6c00020
Update entity.py
balloob Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions homeassistant/components/mqtt/binary_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ async def discovery_update(self, discovery_payload):
await self.availability_discovery_update(config)
await self.device_info_discovery_update(config)
await self._subscribe_topics()
self.async_schedule_update_ha_state()
self.async_write_ha_state()

async def _subscribe_topics(self):
"""(Re)Subscribe to topics."""
Expand All @@ -130,7 +130,7 @@ def off_delay_listener(now):
"""Switch device off after a delay."""
self._delay_listener = None
self._state = False
self.async_schedule_update_ha_state()
self.async_write_ha_state()

@callback
def state_message_received(_topic, payload, _qos):
Expand Down Expand Up @@ -159,7 +159,7 @@ def state_message_received(_topic, payload, _qos):
self._delay_listener = evt.async_call_later(
self.hass, off_delay, off_delay_listener)

self.async_schedule_update_ha_state()
self.async_write_ha_state()

self._sub_state = await subscription.async_subscribe_topics(
self.hass, self._sub_state,
Expand Down
19 changes: 12 additions & 7 deletions homeassistant/helpers/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,6 @@ async def async_update_ha_state(self, force_refresh=False):

This method must be run in the event loop.
"""
if self.hass is None:
balloob marked this conversation as resolved.
Show resolved Hide resolved
raise RuntimeError("Attribute hass is None for {}".format(self))

if self.entity_id is None:
raise NoEntitySpecifiedError(
"No entity id specified for entity {}".format(self.name))

# update entity data
if force_refresh:
try:
Expand All @@ -222,6 +215,18 @@ async def async_update_ha_state(self, force_refresh=False):
_LOGGER.exception("Update for %s fails", self.entity_id)
return

self.async_write_ha_state()

@callback
def async_write_ha_state(self):
"""Write the state to the state machine."""
if self.hass is None:
raise RuntimeError("Attribute hass is None for {}".format(self))

if self.entity_id is None:
raise NoEntitySpecifiedError(
"No entity id specified for entity {}".format(self.name))

start = timer()

if not self.available:
Expand Down
4 changes: 2 additions & 2 deletions tests/components/cast/test_media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,16 +275,16 @@ async def test_entity_media_states(hass: HomeAssistantType):
state = hass.states.get('media_player.speaker')
assert state.state == 'playing'

entity.new_media_status(media_status)
media_status.player_is_playing = False
media_status.player_is_paused = True
entity.new_media_status(media_status)
await hass.async_block_till_done()
state = hass.states.get('media_player.speaker')
assert state.state == 'paused'

entity.new_media_status(media_status)
media_status.player_is_paused = False
media_status.player_is_idle = True
entity.new_media_status(media_status)
await hass.async_block_till_done()
state = hass.states.get('media_player.speaker')
assert state.state == 'idle'
Expand Down