Skip to content

Change unique_id for webostv #34979

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
ludeeus merged 2 commits into from
May 11, 2020
Merged

Change unique_id for webostv #34979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b037d
Revert #34656
jjlawren Apr 30, 2020
585f014
Use pairing key as unique_id
jjlawren Apr 30, 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
32 changes: 8 additions & 24 deletions homeassistant/components/webostv/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
)
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers.event import async_call_later

from .const import ATTR_SOUND_OUTPUT

Expand Down Expand Up @@ -139,30 +138,15 @@ async def async_on_stop(event):
client.clear_state_update_callbacks()
await client.disconnect()

async def async_load_platforms(_):
"""Load platforms and event listener."""
await async_connect(client)
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, async_on_stop)

if client.connection is None:
async_call_later(hass, 60, async_load_platforms)
_LOGGER.debug(
"No connection could be made with host %s, retrying in 60 seconds",
conf.get(CONF_HOST),
)
return

hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, async_on_stop)

hass.async_create_task(
hass.helpers.discovery.async_load_platform(
"media_player", DOMAIN, conf, config
)
)
hass.async_create_task(
hass.helpers.discovery.async_load_platform("notify", DOMAIN, conf, config)
)

await async_load_platforms(None)
await async_connect(client)
hass.async_create_task(
hass.helpers.discovery.async_load_platform("media_player", DOMAIN, conf, config)
)
hass.async_create_task(
hass.helpers.discovery.async_load_platform("notify", DOMAIN, conf, config)
)


async def async_request_configuration(hass, config, conf, client):
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/webostv/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def __init__(self, client: WebOsClient, name: str, customize, on_script=None):
"""Initialize the webos device."""
self._client = client
self._name = name
self._unique_id = client.software_info["device_id"]
self._unique_id = client.client_key
self._customize = customize
self._on_script = on_script

Expand Down
2 changes: 1 addition & 1 deletion tests/components/webostv/test_media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def client_fixture():
"homeassistant.components.webostv.WebOsClient", autospec=True
) as mock_client_class:
client = mock_client_class.return_value
client.connection = True
client.software_info = {"device_id": "a1:b1:c1:d1:e1:f1"}
client.client_key = "0123456789"
yield client


Expand Down