Skip to content

Handle race condition in harmony setup #33611

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

Merged
bdraco merged 5 commits into from
Apr 4, 2020
Merged

Handle race condition in harmony setup #33611

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ce22e8
Handle race condition in harmony setup
bdraco Apr 3, 2020
9fbb32d
Update homeassistant/components/harmony/config_flow.py
bdraco Apr 4, 2020
8908be9
reduce
bdraco Apr 4, 2020
a8999e8
Merge branch 'harmony_config_flow_ssdp_race' of github.com:bdraco/hom…
bdraco Apr 4, 2020
a3f616c
black
bdraco Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions homeassistant/components/harmony/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,11 @@ async def async_step_link(self, user_input=None):

async def async_step_import(self, validated_input):
"""Handle import."""
await self.async_set_unique_id(validated_input[UNIQUE_ID])
await self.async_set_unique_id(
validated_input[UNIQUE_ID], raise_on_progress=False
)
self._abort_if_unique_id_configured()

# Everything was validated in remote async_setup_platform
# all we do now is create.
return await self._async_create_entry_from_valid_input(
Expand All @@ -149,14 +152,8 @@ async def _async_create_entry_from_valid_input(self, validated, user_input):
# Options from yaml are preserved, we will pull them out when
# we setup the config entry
data.update(_options_from_user_input(user_input))
return self.async_create_entry(title=validated[CONF_NAME], data=data)

def _host_already_configured(self, user_input):
Comment thread
bdraco marked this conversation as resolved.
"""See if we already have a harmony matching user input configured."""
existing_hosts = {
entry.data[CONF_HOST] for entry in self._async_current_entries()
}
return user_input[CONF_HOST] in existing_hosts
return self.async_create_entry(title=validated[CONF_NAME], data=data)


def _options_from_user_input(user_input):
Expand Down