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

Sonos playlists play media #26054

Merged
merged 4 commits into from Aug 20, 2019
Merged

Sonos playlists play media #26054

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0829cb
Add handling for Sonos playlists in media_player.play_media
ahertz Aug 18, 2019
e7df8a6
Avoid breaking change by falling back to previous behavior
ahertz Aug 18, 2019
b685ede
Use the proper MEDIA_TYPE_PLAYLIST constant.
ahertz Aug 18, 2019
bcf7539
Addressed comments, restricting media_type to music or playlist
ahertz Aug 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 26 additions & 10 deletions homeassistant/components/sonos/media_player.py
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@
from homeassistant.components.media_player.const import (
ATTR_MEDIA_ENQUEUE,
MEDIA_TYPE_MUSIC,
MEDIA_TYPE_PLAYLIST,
SUPPORT_CLEAR_PLAYLIST,
SUPPORT_NEXT_TRACK,
SUPPORT_PAUSE,
Expand Down Expand Up @@ -938,20 +939,35 @@ def play_media(self, media_type, media_id, **kwargs):
"""
Send the play_media command to the media player.

If media_type is "playlist", media_id should be a Sonos
Playlist name. Otherwise, media_id should be a URI.

If ATTR_MEDIA_ENQUEUE is True, add `media_id` to the queue.
"""
if kwargs.get(ATTR_MEDIA_ENQUEUE):
if media_type == MEDIA_TYPE_MUSIC:
if kwargs.get(ATTR_MEDIA_ENQUEUE):
try:
self.soco.add_uri_to_queue(media_id)
except SoCoUPnPException:
_LOGGER.error(
'Error parsing media uri "%s", '
"please check it's a valid media resource "
"supported by Sonos",
media_id,
)
else:
self.soco.play_uri(media_id)
elif media_type == MEDIA_TYPE_PLAYLIST:
try:
self.soco.add_uri_to_queue(media_id)
except SoCoUPnPException:
_LOGGER.error(
'Error parsing media uri "%s", '
"please check it's a valid media resource "
"supported by Sonos",
media_id,
)
playlists = self.soco.get_sonos_playlists()
playlist = next(p for p in playlists if p.title == media_id)
self.soco.clear_queue()
self.soco.add_to_queue(playlist)
self.soco.play_from_queue(0)
except StopIteration:
_LOGGER.error('Could not find a Sonos playlist named "%s"', media_id)
else:
self.soco.play_uri(media_id)
_LOGGER.error('Sonos does not support a media type of "%s"', media_type)

@soco_error()
def join(self, slaves):
Expand Down