From 1dc724274e5dee341d804ca13b20b62596f07e3b Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Mon, 4 Sep 2023 09:05:59 +0200
Subject: [PATCH] Use shorthand attributes for Heos (#99344)
---
homeassistant/components/heos/media_player.py | 32 ++++++-------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/homeassistant/components/heos/media_player.py b/homeassistant/components/heos/media_player.py
index e2487e90a99..8502dec28fa 100644
--- a/homeassistant/components/heos/media_player.py
+++ b/homeassistant/components/heos/media_player.py
@@ -114,6 +114,8 @@ class HeosMediaPlayer(MediaPlayerEntity):
_attr_media_content_type = MediaType.MUSIC
_attr_should_poll = False
+ _attr_supported_features = BASE_SUPPORTED_FEATURES
+ _attr_media_image_remotely_accessible = True
_attr_has_entity_name = True
_attr_name = None
@@ -122,9 +124,16 @@ class HeosMediaPlayer(MediaPlayerEntity):
self._media_position_updated_at = None
self._player = player
self._signals = []
- self._attr_supported_features = BASE_SUPPORTED_FEATURES
self._source_manager = None
self._group_manager = None
+ self._attr_unique_id = str(player.player_id)
+ self._attr_device_info = DeviceInfo(
+ identifiers={(HEOS_DOMAIN, player.player_id)},
+ manufacturer="HEOS",
+ model=player.model,
+ name=player.name,
+ sw_version=player.version,
+ )
async def _player_update(self, player_id, event):
"""Handle player attribute updated."""
@@ -306,17 +315,6 @@ class HeosMediaPlayer(MediaPlayerEntity):
"""Return True if the device is available."""
return self._player.available
- @property
- def device_info(self) -> DeviceInfo:
- """Get attributes about the device."""
- return DeviceInfo(
- identifiers={(HEOS_DOMAIN, self._player.player_id)},
- manufacturer="HEOS",
- model=self._player.model,
- name=self._player.name,
- sw_version=self._player.version,
- )
-
@property
def extra_state_attributes(self) -> dict[str, Any]:
"""Get additional attribute about the state."""
@@ -377,11 +375,6 @@ class HeosMediaPlayer(MediaPlayerEntity):
return None
return self._media_position_updated_at
- @property
- def media_image_remotely_accessible(self) -> bool:
- """If the image url is remotely accessible."""
- return True
-
@property
def media_image_url(self) -> str:
"""Image url of current playing media."""
@@ -414,11 +407,6 @@ class HeosMediaPlayer(MediaPlayerEntity):
"""State of the player."""
return PLAY_STATE_TO_STATE[self._player.state]
- @property
- def unique_id(self) -> str:
- """Return a unique ID."""
- return str(self._player.player_id)
-
@property
def volume_level(self) -> float:
"""Volume level of the media player (0..1)."""