From e406b8d1e309ab21754cbc016c09170cbd877fbc Mon Sep 17 00:00:00 2001
From: Aidan Timson <aidan@timmo.dev>
Date: Sun, 8 Oct 2023 09:42:08 +0100
Subject: [PATCH] Address System Bridge post merge review (#101614)

Address Post Merged PR Review for #97532
---
 .../components/system_bridge/media_player.py  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/system_bridge/media_player.py b/homeassistant/components/system_bridge/media_player.py
index c0d58c74c61..088c57573f1 100644
--- a/homeassistant/components/system_bridge/media_player.py
+++ b/homeassistant/components/system_bridge/media_player.py
@@ -54,6 +54,15 @@ MEDIA_SET_REPEAT_MAP: Final[dict[RepeatMode, int]] = {
     RepeatMode.ALL: 2,
 }
 
+MEDIA_PLAYER_DESCRIPTION: Final[
+    MediaPlayerEntityDescription
+] = MediaPlayerEntityDescription(
+    key="media",
+    translation_key="media",
+    icon="mdi:volume-high",
+    device_class=MediaPlayerDeviceClass.RECEIVER,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -62,19 +71,14 @@ async def async_setup_entry(
 ) -> None:
     """Set up System Bridge media players based on a config entry."""
     coordinator: SystemBridgeDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-    data: SystemBridgeCoordinatorData = coordinator.data
+    data = coordinator.data
 
     if data.media is not None:
         async_add_entities(
             [
                 SystemBridgeMediaPlayer(
                     coordinator,
-                    MediaPlayerEntityDescription(
-                        key="media",
-                        translation_key="media",
-                        icon="mdi:volume-high",
-                        device_class=MediaPlayerDeviceClass.RECEIVER,
-                    ),
+                    MEDIA_PLAYER_DESCRIPTION,
                     entry.data[CONF_PORT],
                 )
             ]
@@ -103,7 +107,7 @@ class SystemBridgeMediaPlayer(SystemBridgeEntity, MediaPlayerEntity):
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return self.coordinator.data.media is not None
+        return super().available and self.coordinator.data.media is not None
 
     @property
     def supported_features(self) -> MediaPlayerEntityFeature: