From 1fd3a86239d33952cc083fd91f27ccc9a801c7c0 Mon Sep 17 00:00:00 2001
From: Anders Melchiorsen <amelchio@nogoto.net>
Date: Sat, 30 Jan 2021 15:38:43 +0100
Subject: [PATCH] Upgrade pysonos to 0.0.40 (#45743)

---
 homeassistant/components/sonos/manifest.json  |  2 +-
 .../components/sonos/media_player.py          | 27 ++++++++++---------
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index 1852f9c3849..e208a0e7a32 100644
--- a/homeassistant/components/sonos/manifest.json
+++ b/homeassistant/components/sonos/manifest.json
@@ -3,7 +3,7 @@
   "name": "Sonos",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sonos",
-  "requirements": ["pysonos==0.0.37"],
+  "requirements": ["pysonos==0.0.40"],
   "after_dependencies": ["plex"],
   "ssdp": [
     {
diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py
index 9d89bdf68f8..2c69730211b 100644
--- a/homeassistant/components/sonos/media_player.py
+++ b/homeassistant/components/sonos/media_player.py
@@ -10,11 +10,11 @@ import async_timeout
 import pysonos
 from pysonos import alarms
 from pysonos.core import (
+    MUSIC_SRC_LINE_IN,
+    MUSIC_SRC_RADIO,
+    MUSIC_SRC_TV,
     PLAY_MODE_BY_MEANING,
     PLAY_MODES,
-    PLAYING_LINE_IN,
-    PLAYING_RADIO,
-    PLAYING_TV,
 )
 from pysonos.exceptions import SoCoException, SoCoUPnPException
 import pysonos.music_library
@@ -759,11 +759,12 @@ class SonosEntity(MediaPlayerEntity):
         self._status = new_status
 
         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)
-        elif whats_playing == PLAYING_LINE_IN:
+        elif music_source == MUSIC_SRC_LINE_IN:
             self.update_media_linein(SOURCE_LINEIN)
         else:
             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_title = track_info.get("title")
 
-                if whats_playing == PLAYING_RADIO:
+                if music_source == MUSIC_SRC_RADIO:
                     self.update_media_radio(variables, track_info)
                 else:
                     self.update_media_music(update_position, track_info)
@@ -816,7 +817,7 @@ class SonosEntity(MediaPlayerEntity):
                 uri_meta_data, pysonos.data_structures.DidlAudioBroadcast
             ) and (
                 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
             ):
                 self._media_title = uri_meta_data.title
@@ -1117,7 +1118,7 @@ class SonosEntity(MediaPlayerEntity):
             if len(fav) == 1:
                 src = fav.pop()
                 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)
                 else:
                     self.soco.clear_queue()
@@ -1201,8 +1202,8 @@ class SonosEntity(MediaPlayerEntity):
         elif media_type in (MEDIA_TYPE_MUSIC, MEDIA_TYPE_TRACK):
             if kwargs.get(ATTR_MEDIA_ENQUEUE):
                 try:
-                    if self.soco.is_spotify_uri(media_id):
-                        self.soco.add_spotify_uri_to_queue(media_id)
+                    if self.soco.is_service_uri(media_id):
+                        self.soco.add_service_uri_to_queue(media_id)
                     else:
                         self.soco.add_uri_to_queue(media_id)
                 except SoCoUPnPException:
@@ -1213,9 +1214,9 @@ class SonosEntity(MediaPlayerEntity):
                         media_id,
                     )
             else:
-                if self.soco.is_spotify_uri(media_id):
+                if self.soco.is_service_uri(media_id):
                     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)
                 else:
                     self.soco.play_uri(media_id)
diff --git a/requirements_all.txt b/requirements_all.txt
index af3f8235a9b..5e0792afcec 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1708,7 +1708,7 @@ pysnmp==4.4.12
 pysoma==0.0.10
 
 # homeassistant.components.sonos
-pysonos==0.0.37
+pysonos==0.0.40
 
 # homeassistant.components.spc
 pyspcwebgw==0.4.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 90505f1297c..1aa5494a7ca 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -884,7 +884,7 @@ pysmartthings==0.7.6
 pysoma==0.0.10
 
 # homeassistant.components.sonos
-pysonos==0.0.37
+pysonos==0.0.40
 
 # homeassistant.components.spc
 pyspcwebgw==0.4.0