From f5f56b0db03b407e058d45cd3549af1388916e06 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Fri, 14 Feb 2020 20:24:31 +0100
Subject: [PATCH] Guard currently playing for being a NoneType

---
 .../components/spotify/media_player.py        | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/spotify/media_player.py b/homeassistant/components/spotify/media_player.py
index 8bd5782f7ee..70cfa34f04f 100644
--- a/homeassistant/components/spotify/media_player.py
+++ b/homeassistant/components/spotify/media_player.py
@@ -152,11 +152,15 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def volume_level(self) -> Optional[float]:
         """Return the device volume."""
+        if self._currently_playing is None:
+            return None
         return self._currently_playing.get("device", {}).get("volume_percent", 0) / 100
 
     @property
     def media_content_id(self) -> Optional[str]:
         """Return the media URL."""
+        if self._currently_playing is None:
+            return None
         return self._currently_playing.get("item", {}).get("name")
 
     @property
@@ -167,7 +171,10 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def media_duration(self) -> Optional[int]:
         """Duration of current playing media in seconds."""
-        if self._currently_playing.get("item") is None:
+        if (
+            self._currently_playing is None
+            or self._currently_playing.get("item") is None
+        ):
             return None
         return self._currently_playing["item"]["duration_ms"] / 1000
 
@@ -189,7 +196,8 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     def media_image_url(self) -> Optional[str]:
         """Return the media image URL."""
         if (
-            self._currently_playing.get("item") is None
+            self._currently_playing is None
+            or self._currently_playing.get("item") is None
             or not self._currently_playing["item"]["album"]["images"]
         ):
             return None
@@ -203,12 +211,17 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def media_title(self) -> Optional[str]:
         """Return the media title."""
+        if self._currently_playing is None:
+            return None
         return self._currently_playing.get("item", {}).get("name")
 
     @property
     def media_artist(self) -> Optional[str]:
         """Return the media artist."""
-        if self._currently_playing.get("item") is None:
+        if (
+            self._currently_playing is None
+            or self._currently_playing.get("item") is None
+        ):
             return None
         return ", ".join(
             [artist["name"] for artist in self._currently_playing["item"]["artists"]]
@@ -217,13 +230,18 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def media_album_name(self) -> Optional[str]:
         """Return the media album."""
-        if self._currently_playing.get("item") is None:
+        if (
+            self._currently_playing is None
+            or self._currently_playing.get("item") is None
+        ):
             return None
         return self._currently_playing["item"]["album"]["name"]
 
     @property
     def media_track(self) -> Optional[int]:
         """Track number of current playing media, music track only."""
+        if self._currently_playing is None:
+            return None
         return self._currently_playing.get("item", {}).get("track_number")
 
     @property
@@ -236,6 +254,8 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def source(self) -> Optional[str]:
         """Return the current playback device."""
+        if self._currently_playing is None:
+            return None
         return self._currently_playing.get("device", {}).get("name")
 
     @property
@@ -248,6 +268,8 @@ class SpotifyMediaPlayer(MediaPlayerDevice):
     @property
     def shuffle(self) -> bool:
         """Shuffling state."""
+        if self._currently_playing is None:
+            return False
         return bool(self._currently_playing.get("shuffle_state"))
 
     @property