From f26cbbdef9a097f9172c4eba869ef43f3a23afdc Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Fri, 14 Feb 2020 22:58:39 +0100
Subject: [PATCH] Spotify integration hotfixes (#31835)

* Remove services file, incorrect info

* Guard currently playing for being a NoneType

* Revert "Guard currently playing for being a NoneType"

This reverts commit f5f56b0db03b407e058d45cd3549af1388916e06.

* Guard currently playing item is None

* Process review suggestions
---
 homeassistant/components/spotify/media_player.py | 9 ++++++---
 homeassistant/components/spotify/services.yaml   | 9 ---------
 2 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 homeassistant/components/spotify/services.yaml

diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index 8bd5782f7ee..9588f428a66 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -157,7 +157,8 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def media_content_id(self) -> Optional[str]:
         """Return the media URL."""
-        return self._currently_playing.get("item", {}).get("name")
+        item = self._currently_playing.get("item") or {}
+        return item.get("name")
 
     @property
     def media_content_type(self) -> Optional[str]:
@@ -203,7 +204,8 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def media_title(self) -> Optional[str]:
         """Return the media title."""
-        return self._currently_playing.get("item", {}).get("name")
+        item = self._currently_playing.get("item") or {}
+        return item.get("name")
 
     @property
     def media_artist(self) -> Optional[str]:
@@ -224,7 +226,8 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def media_track(self) -> Optional[int]:
         """Track number of current playing media, music track only."""
-        return self._currently_playing.get("item", {}).get("track_number")
+        item = self._currently_playing.get("item") or {}
+        return item.get("track_number")
 
     @property
     def media_playlist(self):
diff --git a/homeassistant/components/spotify/services.yaml b/homeassistant/components/spotify/services.yaml
deleted file mode 100644
index e532f736652..00000000000
--- a/homeassistant/components/spotify/services.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-play_playlist:
-  description: Play a Spotify playlist.
-  fields:
-    media_content_id:
-      description: Spotify URI of the playlist.
-      example: 'spotify:playlist:0IpRnqCHSjun48oQRX1Dy7'
-    random_song:
-      description: True to select random song at start, False to start from beginning.
-      example: true
\ No newline at end of file