Skip to content
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

Jump to bottom

Use entity class attributes for Bluesound #53033

Merged
merged 4 commits into from
Jul 22, 2021
Merged

Use entity class attributes for Bluesound #53033

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8810ae
Use entity class attributes for bluesound
tkdrob Jul 8, 2021
0d1b758
rework
tkdrob Jul 14, 2021
fc68aa5
tweak
tkdrob Jul 15, 2021
32055a8
tweak
tkdrob Jul 22, 2021
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
Next Next commit
Use entity class attributes for bluesound
  • Loading branch information
@tkdrob
tkdrob committed Jul 8, 2021
commit a8810ae82ab9b9f163e35cf9e5b6bc80a7923a4c
80 changes: 22 additions & 58 deletions homeassistant/components/bluesound/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,33 +203,35 @@ async def async_service_handler(service):
class BluesoundPlayer(MediaPlayerEntity):
"""Representation of a Bluesound Player."""

def __init__(self, hass, host, port=None, name=None, init_callback=None):
_attr_media_content_type = MEDIA_TYPE_MUSIC

def __init__(self, hass, host, port=DEFAULT_PORT, name=None, init_callback=None):
"""Initialize the media player."""
self.host = host
self._hass = hass
self.port = port
self._polling_session = async_get_clientsession(hass)
self._polling_task = None # The actual polling task.
self._name = name
self._icon = None
self._attr_name = name
self._capture_items = []
self._services_items = []
self._preset_items = []
self._sync_status = {}
self._status = None
self._last_status_update = None
self._is_online = False
self._retry_remove = None
self._muted = False
self._master = None
self._is_master = False
self._group_name = None
self._group_list = []
self._bluesound_device_name = None

self._init_callback = init_callback
if self.port is None:
self.port = DEFAULT_PORT
attributes = {}
if self._group_list:
attributes = {ATTR_BLUESOUND_GROUP: self._group_list}
attributes[ATTR_MASTER] = self._is_master
self._attr_extra_state_attributes = attributes

class _TimeoutException(Exception):
pass
Expand Down Expand Up @@ -385,6 +387,11 @@ async def async_update_status(self):
etag = ""
if self._status is not None:
etag = self._status.get("@etag", "")
self._attr_shuffle = self._status.get("shuffle", "0") == "1"
if self._status is None or (self.is_grouped and not self.is_master):
self._attr_media_title = None
else:
self._attr_media_title = self._status.get("title1")

if etag != "":
url = f"Status?etag={etag}&timeout=120.0"
Expand All @@ -402,7 +409,7 @@ async def async_update_status(self):
if response.status == HTTP_OK:
result = await response.text()
self._is_online = True
self._last_status_update = dt_util.utcnow()
self._attr_media_position_updated_at = dt_util.utcnow()
self._status = xmltodict.parse(result)["status"].copy()

group_name = self._status.get("groupName")
Expand Down Expand Up @@ -438,7 +445,7 @@ async def async_update_status(self):

except (asyncio.TimeoutError, ClientError):
self._is_online = False
self._last_status_update = None
self._attr_media_position_updated_at = None
self._status = None
self.async_write_ha_state()
_LOGGER.info("Client connection error, marking %s as offline", self._name)
Expand Down Expand Up @@ -542,11 +549,6 @@ def _create_service_item(item):

return self._services_items

@property
def media_content_type(self):
"""Content type of current playing media."""
return MEDIA_TYPE_MUSIC

@property
def state(self):
"""Return the state of the device."""
Expand All @@ -563,14 +565,6 @@ def state(self):
return STATE_PLAYING
return STATE_IDLE

@property
def media_title(self):
"""Title of current playing media."""
if self._status is None or (self.is_grouped and not self.is_master):
return None

return self._status.get("title1")

@property
def media_artist(self):
"""Artist of current playing media (Music track only)."""
Expand Down Expand Up @@ -617,7 +611,7 @@ def media_position(self):
return None

mediastate = self.state
if self._last_status_update is None or mediastate == STATE_IDLE:
if self.media_position_updated_at is None or mediastate == STATE_IDLE:
return None

position = self._status.get("secs")
Expand All @@ -626,7 +620,9 @@ def media_position(self):

position = float(position)
if mediastate == STATE_PLAYING:
position += (dt_util.utcnow() - self._last_status_update).total_seconds()
position += (
dt_util.utcnow() - self.media_position_updated_at
).total_seconds()

return position

Expand All @@ -641,11 +637,6 @@ def media_duration(self):
return None
return float(duration)

@property
def media_position_updated_at(self):
"""Last time status was updated."""
return self._last_status_update

@property
def volume_level(self):
"""Volume level of the media player (0..1)."""
Expand All @@ -668,21 +659,11 @@ def is_volume_muted(self):
mute = bool(int(mute))
return mute

@property
def name(self):
"""Return the name of the device."""
return self._name

@property
def bluesound_device_name(self):
"""Return the device name as returned by the device."""
return self._bluesound_device_name

@property
def icon(self):
"""Return the icon of the device."""
return self._icon

@property
def source_list(self):
"""List of available input sources."""
Expand Down Expand Up @@ -809,27 +790,21 @@ def supported_features(self):
| SUPPORT_VOLUME_SET
| SUPPORT_VOLUME_MUTE
)

if self._status.get("canSeek", "") == "1":
supported = supported | SUPPORT_SEEK

return supported

@property
def is_master(self):
def is_master(self) -> bool:
"""Return true if player is a coordinator."""
return self._is_master

@property
def is_grouped(self):
def is_grouped(self) -> bool:
"""Return true if player is a coordinator."""
return self._master is not None or self._is_master

@property
def shuffle(self):
"""Return true if shuffle is active."""
return self._status.get("shuffle", "0") == "1"

async def async_join(self, master):
"""Join the player to a group."""
master_device = [
Expand All @@ -849,17 +824,6 @@ async def async_join(self, master):
else:
_LOGGER.error("Master not found %s", master_device)

@property
def extra_state_attributes(self):
"""List members in group."""
attributes = {}
if self._group_list:
attributes = {ATTR_BLUESOUND_GROUP: self._group_list}

attributes[ATTR_MASTER] = self._is_master

return attributes

def rebuild_bluesound_group(self):
"""Rebuild the list of entities in speaker group."""
if self._group_name is None:
Expand Down