jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 03:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup handling of new enqueue & announce features in Sonos (#72801)

Browse Source
This commit is contained in:
jjlawren 2022-05-31 23:39:07 -05:00 committed by Franck Nijhof
parent 1274448de1
commit 384cb44d15
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
homeassistant/components/sonos/media_player.py
View File

@ -25,6 +25,7 @@ from homeassistant.components.media_player import (
) )
from homeassistant.components.media_player.const import ( from homeassistant.components.media_player.const import (
ATTR_INPUT_SOURCE, ATTR_INPUT_SOURCE,
ATTR_MEDIA_ANNOUNCE,
ATTR_MEDIA_ENQUEUE, ATTR_MEDIA_ENQUEUE,
MEDIA_TYPE_ALBUM, MEDIA_TYPE_ALBUM,
MEDIA_TYPE_ARTIST, MEDIA_TYPE_ARTIST,
@ -527,7 +528,9 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
self.coordinator.soco.clear_queue() self.coordinator.soco.clear_queue()
@soco_error() @soco_error()
def play_media(self, media_type: str, media_id: str, **kwargs: Any) -> None: def play_media( # noqa: C901
self, media_type: str, media_id: str, **kwargs: Any
) -> None:
""" """
Send the play_media command to the media player. Send the play_media command to the media player.
@ -539,6 +542,12 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
If media_type is "playlist", media_id should be a Sonos If media_type is "playlist", media_id should be a Sonos
Playlist name. Otherwise, media_id should be a URI. Playlist name. Otherwise, media_id should be a URI.
""" """
# Use 'replace' as the default enqueue option
enqueue = kwargs.get(ATTR_MEDIA_ENQUEUE, MediaPlayerEnqueue.REPLACE)
if kwargs.get(ATTR_MEDIA_ANNOUNCE):
# Temporary workaround until announce support is added
enqueue = MediaPlayerEnqueue.PLAY
if spotify.is_spotify_media_type(media_type): if spotify.is_spotify_media_type(media_type):
media_type = spotify.resolve_spotify_media_type(media_type) media_type = spotify.resolve_spotify_media_type(media_type)
media_id = spotify.spotify_uri_from_media_browser_url(media_id) media_id = spotify.spotify_uri_from_media_browser_url(media_id)
@ -574,17 +583,17 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
) )
if result.shuffle: if result.shuffle:
self.set_shuffle(True) self.set_shuffle(True)
if kwargs.get(ATTR_MEDIA_ENQUEUE) == MediaPlayerEnqueue.ADD: if enqueue == MediaPlayerEnqueue.ADD:
plex_plugin.add_to_queue(result.media) plex_plugin.add_to_queue(result.media)
elif kwargs.get(ATTR_MEDIA_ENQUEUE) in ( elif enqueue in (
MediaPlayerEnqueue.NEXT, MediaPlayerEnqueue.NEXT,
MediaPlayerEnqueue.PLAY, MediaPlayerEnqueue.PLAY,
): ):
pos = (self.media.queue_position or 0) + 1 pos = (self.media.queue_position or 0) + 1
new_pos = plex_plugin.add_to_queue(result.media, position=pos) new_pos = plex_plugin.add_to_queue(result.media, position=pos)
if kwargs.get(ATTR_MEDIA_ENQUEUE) == MediaPlayerEnqueue.PLAY: if enqueue == MediaPlayerEnqueue.PLAY:
soco.play_from_queue(new_pos - 1) soco.play_from_queue(new_pos - 1)
else: elif enqueue == MediaPlayerEnqueue.REPLACE:
soco.clear_queue() soco.clear_queue()
plex_plugin.add_to_queue(result.media) plex_plugin.add_to_queue(result.media)
soco.play_from_queue(0) soco.play_from_queue(0)
@ -592,17 +601,17 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
share_link = self.coordinator.share_link share_link = self.coordinator.share_link
if share_link.is_share_link(media_id): if share_link.is_share_link(media_id):
if kwargs.get(ATTR_MEDIA_ENQUEUE) == MediaPlayerEnqueue.ADD: if enqueue == MediaPlayerEnqueue.ADD:
share_link.add_share_link_to_queue(media_id) share_link.add_share_link_to_queue(media_id)
elif kwargs.get(ATTR_MEDIA_ENQUEUE) in ( elif enqueue in (
MediaPlayerEnqueue.NEXT, MediaPlayerEnqueue.NEXT,
MediaPlayerEnqueue.PLAY, MediaPlayerEnqueue.PLAY,
): ):
pos = (self.media.queue_position or 0) + 1 pos = (self.media.queue_position or 0) + 1
new_pos = share_link.add_share_link_to_queue(media_id, position=pos) new_pos = share_link.add_share_link_to_queue(media_id, position=pos)
if kwargs.get(ATTR_MEDIA_ENQUEUE) == MediaPlayerEnqueue.PLAY: if enqueue == MediaPlayerEnqueue.PLAY:
soco.play_from_queue(new_pos - 1) soco.play_from_queue(new_pos - 1)
else: elif enqueue == MediaPlayerEnqueue.REPLACE:
soco.clear_queue() soco.clear_queue()
share_link.add_share_link_to_queue(media_id) share_link.add_share_link_to_queue(media_id)
soco.play_from_queue(0) soco.play_from_queue(0)
@ -610,17 +619,17 @@ class SonosMediaPlayerEntity(SonosEntity, MediaPlayerEntity):
# If media ID is a relative URL, we serve it from HA. # If media ID is a relative URL, we serve it from HA.
media_id = async_process_play_media_url(self.hass, media_id) media_id = async_process_play_media_url(self.hass, media_id)
if kwargs.get(ATTR_MEDIA_ENQUEUE) == MediaPlayerEnqueue.ADD: if enqueue == MediaPlayerEnqueue.ADD:
soco.add_uri_to_queue(media_id) soco.add_uri_to_queue(media_id)
elif kwargs.get(ATTR_MEDIA_ENQUEUE) in ( elif enqueue in (
MediaPlayerEnqueue.NEXT, MediaPlayerEnqueue.NEXT,
MediaPlayerEnqueue.PLAY, MediaPlayerEnqueue.PLAY,
): ):
pos = (self.media.queue_position or 0) + 1 pos = (self.media.queue_position or 0) + 1
new_pos = soco.add_uri_to_queue(media_id, position=pos) new_pos = soco.add_uri_to_queue(media_id, position=pos)
if kwargs.get(ATTR_MEDIA_ENQUEUE) == MediaPlayerEnqueue.PLAY: if enqueue == MediaPlayerEnqueue.PLAY:
soco.play_from_queue(new_pos - 1) soco.play_from_queue(new_pos - 1)
else: elif enqueue == MediaPlayerEnqueue.REPLACE:
soco.play_uri(media_id, force_radio=is_radio) soco.play_uri(media_id, force_radio=is_radio)
elif media_type == MEDIA_TYPE_PLAYLIST: elif media_type == MEDIA_TYPE_PLAYLIST:
if media_id.startswith("S:"): if media_id.startswith("S:"):