Lots of changes and modernization. WIP

custom_components/browser_mod/media_player.py

@@ -25,47 +25,35 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 
-from .helpers import setup_platform, BrowserModEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-PLATFORM = "media_player"
+from .helpers import BrowserModEntity2
+from .const import DOMAIN, DATA_ADDERS
 
 
-async def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
-    return setup_platform(hass, config, async_add_devices, PLATFORM, BrowserModPlayer)
-
+async def async_setup_platform(hass, config_entry, async_add_entities, discoveryInfo = None):
+    hass.data[DOMAIN][DATA_ADDERS]["media_player"] = async_add_entities
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     await async_setup_platform(hass, {}, async_add_entities)
 
 
-class BrowserModPlayer(MediaPlayerEntity, BrowserModEntity):
-    domain = PLATFORM
+class BrowserModPlayer(BrowserModEntity2, MediaPlayerEntity):
 
-    def __init__(self, hass, connection, deviceID, alias=None):
-        super().__init__(hass, connection, deviceID, alias)
-        self.last_seen = None
-
-    def updated(self):
-        self.schedule_update_ha_state()
+    def __init__(self, coordinator, deviceID, device):
+        super().__init__(coordinator, deviceID, None)
+        self.device = device
 
     @property
-    def extra_state_attributes(self):
-        return {
-            "type": "browser_mod",
-            "deviceID": self.deviceID,
-        }
+    def unique_id(self):
+        return f"{self.deviceID}-player"
 
     @property
     def state(self):
-        if not self.connection.connection:
-            return STATE_UNAVAILABLE
-        state = self.data.get("state", "unknown")
+        state = self._data.get("player", {}).get("state")
         return {
             "playing": STATE_PLAYING,
             "paused": STATE_PAUSED,
             "stopped": STATE_IDLE,
+            "unavailable": STATE_UNAVAILABLE,
         }.get(state, STATE_UNKNOWN)
 
     @property
@@ -82,30 +70,27 @@ class BrowserModPlayer(MediaPlayerEntity, BrowserModEntity):
 
     @property
     def volume_level(self):
-        return self.data.get("volume", 0)
+        return self._data.get("player", {}).get("volume", 0)
 
     @property
     def is_volume_muted(self):
-        return self.data.get("muted", False)
+        return self._data.get("player", {}).get("muted", False)
 
-    @property
-    def media_content_id(self):
-        return self.data.get("src", "")
 
     def set_volume_level(self, volume):
-        self.connection.send("set_volume", volume_level=volume)
+        self.device.send("player-set-volume", volume_level=volume)
 
     def mute_volume(self, mute):
-        self.connection.send("mute", mute=mute)
+        self.device.send("player-mute", mute=mute)
 
     async def async_play_media(self, media_type, media_id, **kwargs):
         if media_source.is_media_source_id(media_id):
             media_type = MEDIA_TYPE_URL
-            play_item = await media_source.async_resolve_media(self.hass, media_id)
+            play_item = await media_source.async_resolve_media(self.hass, media_id, self.entity_id)
             media_id = play_item.url
         if media_type in (MEDIA_TYPE_URL, MEDIA_TYPE_MUSIC):
             media_id = async_process_play_media_url(self.hass, media_id)
-        self.connection.send("play", media_content_id=media_id)
+        self.device.send("player-play", media_content_id=media_id)
 
     async def async_browse_media(self, media_content_type=None, media_content_id=None):
         """Implement the websocket media browsing helper."""
@@ -116,10 +101,10 @@ class BrowserModPlayer(MediaPlayerEntity, BrowserModEntity):
         )
 
     def media_play(self):
-        self.connection.send("play")
+        self.device.send("player-play")
 
     def media_pause(self):
-        self.connection.send("pause")
+        self.device.send("player-pause")
 
     def media_stop(self):
-        self.connection.send("stop")
+        self.device.send("player-stop")