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

Upgrade pysonos to 0.0.40 (#45743)

Browse Source
This commit is contained in:
Anders Melchiorsen 2021-01-30 15:38:43 +01:00 committed by GitHub
parent 0964393002
commit 1fd3a86239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/sonos/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Sonos", "name": "Sonos",
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/sonos", "documentation": "https://www.home-assistant.io/integrations/sonos",
"requirements": ["pysonos==0.0.37"], "requirements": ["pysonos==0.0.40"],
"after_dependencies": ["plex"], "after_dependencies": ["plex"],
"ssdp": [ "ssdp": [
{ {

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

@ -10,11 +10,11 @@ import async_timeout
import pysonos import pysonos
from pysonos import alarms from pysonos import alarms
from pysonos.core import ( from pysonos.core import (
MUSIC_SRC_LINE_IN,
MUSIC_SRC_RADIO,
MUSIC_SRC_TV,
PLAY_MODE_BY_MEANING, PLAY_MODE_BY_MEANING,
PLAY_MODES, PLAY_MODES,
PLAYING_LINE_IN,
PLAYING_RADIO,
PLAYING_TV,
) )
from pysonos.exceptions import SoCoException, SoCoUPnPException from pysonos.exceptions import SoCoException, SoCoUPnPException
import pysonos.music_library import pysonos.music_library
@ -759,11 +759,12 @@ class SonosEntity(MediaPlayerEntity):
self._status = new_status self._status = new_status
track_uri = variables["current_track_uri"] if variables else None track_uri = variables["current_track_uri"] if variables else None
whats_playing = self.soco.whats_playing(track_uri)
if whats_playing == PLAYING_TV: music_source = self.soco.music_source_from_uri(track_uri)
if music_source == MUSIC_SRC_TV:
self.update_media_linein(SOURCE_TV) self.update_media_linein(SOURCE_TV)
elif whats_playing == PLAYING_LINE_IN: elif music_source == MUSIC_SRC_LINE_IN:
self.update_media_linein(SOURCE_LINEIN) self.update_media_linein(SOURCE_LINEIN)
else: else:
track_info = self.soco.get_current_track_info() track_info = self.soco.get_current_track_info()
@ -775,7 +776,7 @@ class SonosEntity(MediaPlayerEntity):
self._media_album_name = track_info.get("album") self._media_album_name = track_info.get("album")
self._media_title = track_info.get("title") self._media_title = track_info.get("title")
if whats_playing == PLAYING_RADIO: if music_source == MUSIC_SRC_RADIO:
self.update_media_radio(variables, track_info) self.update_media_radio(variables, track_info)
else: else:
self.update_media_music(update_position, track_info) self.update_media_music(update_position, track_info)
@ -816,7 +817,7 @@ class SonosEntity(MediaPlayerEntity):
uri_meta_data, pysonos.data_structures.DidlAudioBroadcast uri_meta_data, pysonos.data_structures.DidlAudioBroadcast
) and ( ) and (
self.state != STATE_PLAYING self.state != STATE_PLAYING
or self.soco.is_radio_uri(self._media_title) or self.soco.music_source_from_uri(self._media_title) == MUSIC_SRC_RADIO
or self._media_title in self._uri or self._media_title in self._uri
): ):
self._media_title = uri_meta_data.title self._media_title = uri_meta_data.title
@ -1117,7 +1118,7 @@ class SonosEntity(MediaPlayerEntity):
if len(fav) == 1: if len(fav) == 1:
src = fav.pop() src = fav.pop()
uri = src.reference.get_uri() uri = src.reference.get_uri()
if self.soco.is_radio_uri(uri): if self.soco.music_source_from_uri(uri) == MUSIC_SRC_RADIO:
self.soco.play_uri(uri, title=source) self.soco.play_uri(uri, title=source)
else: else:
self.soco.clear_queue() self.soco.clear_queue()
@ -1201,8 +1202,8 @@ class SonosEntity(MediaPlayerEntity):
elif media_type in (MEDIA_TYPE_MUSIC, MEDIA_TYPE_TRACK): elif media_type in (MEDIA_TYPE_MUSIC, MEDIA_TYPE_TRACK):
if kwargs.get(ATTR_MEDIA_ENQUEUE): if kwargs.get(ATTR_MEDIA_ENQUEUE):
try: try:
if self.soco.is_spotify_uri(media_id): if self.soco.is_service_uri(media_id):
self.soco.add_spotify_uri_to_queue(media_id) self.soco.add_service_uri_to_queue(media_id)
else: else:
self.soco.add_uri_to_queue(media_id) self.soco.add_uri_to_queue(media_id)
except SoCoUPnPException: except SoCoUPnPException:
@ -1213,9 +1214,9 @@ class SonosEntity(MediaPlayerEntity):
media_id, media_id,
) )
else: else:
if self.soco.is_spotify_uri(media_id): if self.soco.is_service_uri(media_id):
self.soco.clear_queue() self.soco.clear_queue()
self.soco.add_spotify_uri_to_queue(media_id) self.soco.add_service_uri_to_queue(media_id)
self.soco.play_from_queue(0) self.soco.play_from_queue(0)
else: else:
self.soco.play_uri(media_id) self.soco.play_uri(media_id)

2
requirements_all.txt
View File

@ -1708,7 +1708,7 @@ pysnmp==4.4.12
pysoma==0.0.10 pysoma==0.0.10
# homeassistant.components.sonos # homeassistant.components.sonos
pysonos==0.0.37 pysonos==0.0.40
# homeassistant.components.spc # homeassistant.components.spc
pyspcwebgw==0.4.0 pyspcwebgw==0.4.0

2
requirements_test_all.txt
View File

@ -884,7 +884,7 @@ pysmartthings==0.7.6
pysoma==0.0.10 pysoma==0.0.10
# homeassistant.components.sonos # homeassistant.components.sonos
pysonos==0.0.37 pysonos==0.0.40
# homeassistant.components.spc # homeassistant.components.spc
pyspcwebgw==0.4.0 pyspcwebgw==0.4.0