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

Prevent harmony from resetting state with multiple turn ons (#38183)

Browse source 
Automations or HomeKit may turn the device on multiple times
when the current activity is already active which will cause
harmony to lose state.  This behavior is unexpected as turning
the device on when its already on isn't expected to reset state.
This commit is contained in:
J. Nick Koston 2020-07-27 06:31:30 -10:00 • committed by GitHub
parent f38e1ae2c0
commit ddf7ceecd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/harmony/remote.py
View file

@ -136,7 +136,7 @@ class HarmonyRemote(remote.RemoteEntity, RestoreEntity):
self._name = name self._name = name
self.host = host self.host = host
self._state = None self._state = None
self._current_activity = None self._current_activity = ACTIVITY_POWER_OFF
self.default_activity = activity self.default_activity = activity
self._client = HarmonyClient(ip_address=host) self._client = HarmonyClient(ip_address=host)
self._config_path = out_path self._config_path = out_path
@ -340,19 +340,33 @@ class HarmonyRemote(remote.RemoteEntity, RestoreEntity):
if activity: if activity:
activity_id = None activity_id = None
activity_name = None
if activity.isdigit() or activity == "-1": if activity.isdigit() or activity == "-1":
_LOGGER.debug("%s: Activity is numeric", self.name) _LOGGER.debug("%s: Activity is numeric", self.name)
if self._client.get_activity_name(int(activity)): activity_name = self._client.get_activity_name(int(activity))
if activity_name:
activity_id = activity activity_id = activity
if activity_id is None: if activity_id is None:
_LOGGER.debug("%s: Find activity ID based on name", self.name) _LOGGER.debug("%s: Find activity ID based on name", self.name)
activity_id = self._client.get_activity_id(str(activity)) activity_name = str(activity)
activity_id = self._client.get_activity_id(activity_name)
if activity_id is None: if activity_id is None:
_LOGGER.error("%s: Activity %s is invalid", self.name, activity) _LOGGER.error("%s: Activity %s is invalid", self.name, activity)
return return
if self._current_activity == activity_name:
# Automations or HomeKit may turn the device on multiple times
# when the current activity is already active which will cause
# harmony to loose state. This behavior is unexpected as turning
# the device on when its already on isn't expected to reset state.
_LOGGER.debug(
"%s: Current activity is already %s", self.name, activity_name
)
return
try: try:
await self._client.start_activity(activity_id) await self._client.start_activity(activity_id)
except aioexc.TimeOut: except aioexc.TimeOut: