From e42ca35c947a9fadb0a201edf431d45f09ef3da8 Mon Sep 17 00:00:00 2001 From: jjlawren Date: Thu, 25 Mar 2021 13:12:12 -0500 Subject: [PATCH] Bump plexwebsocket to 0.0.13 (#48330) --- homeassistant/components/plex/__init__.py | 7 +++---- homeassistant/components/plex/manifest.json | 2 +- homeassistant/components/plex/server.py | 6 +----- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/plex/helpers.py | 4 ++-- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/homeassistant/components/plex/__init__.py b/homeassistant/components/plex/__init__.py index d84a86984e2..296f1594549 100644 --- a/homeassistant/components/plex/__init__.py +++ b/homeassistant/components/plex/__init__.py @@ -7,7 +7,6 @@ import plexapi.exceptions from plexapi.gdm import GDM from plexwebsocket import ( SIGNAL_CONNECTION_STATE, - SIGNAL_DATA, STATE_CONNECTED, STATE_DISCONNECTED, STATE_STOPPED, @@ -158,9 +157,9 @@ async def async_setup_entry(hass, entry): hass.data[PLEX_DOMAIN][DISPATCHERS][server_id].append(unsub) @callback - def plex_websocket_callback(signal, data, error): + def plex_websocket_callback(msgtype, data, error): """Handle callbacks from plexwebsocket library.""" - if signal == SIGNAL_CONNECTION_STATE: + if msgtype == SIGNAL_CONNECTION_STATE: if data == STATE_CONNECTED: _LOGGER.debug("Websocket to %s successful", entry.data[CONF_SERVER]) @@ -178,7 +177,7 @@ async def async_setup_entry(hass, entry): ) hass.async_create_task(hass.config_entries.async_reload(entry.entry_id)) - elif signal == SIGNAL_DATA: + elif msgtype == "playing": hass.async_create_task(plex_server.async_update_session(data)) session = async_get_clientsession(hass) diff --git a/homeassistant/components/plex/manifest.json b/homeassistant/components/plex/manifest.json index 9410fba1258..e0e62d7150b 100644 --- a/homeassistant/components/plex/manifest.json +++ b/homeassistant/components/plex/manifest.json @@ -6,7 +6,7 @@ "requirements": [ "plexapi==4.5.1", "plexauth==0.0.6", - "plexwebsocket==0.0.12" + "plexwebsocket==0.0.13" ], "dependencies": ["http"], "codeowners": ["@jjlawren"] diff --git a/homeassistant/components/plex/server.py b/homeassistant/components/plex/server.py index d1210e6f3d8..841a9e7cc0d 100644 --- a/homeassistant/components/plex/server.py +++ b/homeassistant/components/plex/server.py @@ -257,11 +257,7 @@ class PlexServer: async def async_update_session(self, payload): """Process a session payload received from a websocket callback.""" - try: - session_payload = payload["PlaySessionStateNotification"][0] - except KeyError: - await self.async_update_platforms() - return + session_payload = payload["PlaySessionStateNotification"][0] state = session_payload["state"] if state == "buffering": diff --git a/requirements_all.txt b/requirements_all.txt index 6730162928e..d40244074a9 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1140,7 +1140,7 @@ plexapi==4.5.1 plexauth==0.0.6 # homeassistant.components.plex -plexwebsocket==0.0.12 +plexwebsocket==0.0.13 # homeassistant.components.plugwise plugwise==0.8.5 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index c44a19e997d..149c156f4cc 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -586,7 +586,7 @@ plexapi==4.5.1 plexauth==0.0.6 # homeassistant.components.plex -plexwebsocket==0.0.12 +plexwebsocket==0.0.13 # homeassistant.components.plugwise plugwise==0.8.5 diff --git a/tests/components/plex/helpers.py b/tests/components/plex/helpers.py index 2fca88fae27..35a01c3bfff 100644 --- a/tests/components/plex/helpers.py +++ b/tests/components/plex/helpers.py @@ -1,7 +1,7 @@ """Helper methods for Plex tests.""" from datetime import timedelta -from plexwebsocket import SIGNAL_CONNECTION_STATE, SIGNAL_DATA, STATE_CONNECTED +from plexwebsocket import SIGNAL_CONNECTION_STATE, STATE_CONNECTED import homeassistant.util.dt as dt_util @@ -29,7 +29,7 @@ def websocket_connected(mock_websocket): def trigger_plex_update(mock_websocket, payload=UPDATE_PAYLOAD): """Call the websocket callback method with a Plex update.""" callback = mock_websocket.call_args[0][1] - callback(SIGNAL_DATA, payload, None) + callback("playing", payload, None) async def wait_for_debouncer(hass):