From ba5e8d133d8b66b5799a2c9d16c5972f320c652c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20St=C3=A5hl?= <pierre.staahl@gmail.com>
Date: Thu, 14 Sep 2017 07:30:29 +0200
Subject: [PATCH] Fix artwork bug in Apple TV (#9415)

* Fix artwork bug in Apple TV

* Clean up some None checks
---
 .../components/media_player/apple_tv.py       | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/media_player/apple_tv.py b/homeassistant/components/media_player/apple_tv.py
index 5deb4cd8dd5..6bd962ef443 100644
--- a/homeassistant/components/media_player/apple_tv.py
+++ b/homeassistant/components/media_player/apple_tv.py
@@ -93,7 +93,7 @@ class AppleTvDevice(MediaPlayerDevice):
         if not self._power.turned_on:
             return STATE_OFF
 
-        if self._playing is not None:
+        if self._playing:
             from pyatv import const
             state = self._playing.play_state
             if state == const.PLAY_STATE_NO_MEDIA or \
@@ -131,7 +131,7 @@ class AppleTvDevice(MediaPlayerDevice):
     @property
     def media_content_type(self):
         """Content type of current playing media."""
-        if self._playing is not None:
+        if self._playing:
             from pyatv import const
             media_type = self._playing.media_type
             if media_type == const.MEDIA_TYPE_VIDEO:
@@ -144,13 +144,13 @@ class AppleTvDevice(MediaPlayerDevice):
     @property
     def media_duration(self):
         """Duration of current playing media in seconds."""
-        if self._playing is not None:
+        if self._playing:
             return self._playing.total_time
 
     @property
     def media_position(self):
         """Position of current playing media in seconds."""
-        if self._playing is not None:
+        if self._playing:
             return self._playing.position
 
     @property
@@ -168,18 +168,23 @@ class AppleTvDevice(MediaPlayerDevice):
     @property
     def media_image_hash(self):
         """Hash value for media image."""
-        if self._playing is not None and self.state != STATE_IDLE:
+        state = self.state
+        if self._playing and state not in [STATE_OFF, STATE_IDLE]:
             return self._playing.hash
 
     @asyncio.coroutine
     def async_get_media_image(self):
         """Fetch media image of current playing image."""
-        return (yield from self.atv.metadata.artwork()), 'image/png'
+        state = self.state
+        if self._playing and state not in [STATE_OFF, STATE_IDLE]:
+            return (yield from self.atv.metadata.artwork()), 'image/png'
+
+        return None, None
 
     @property
     def media_title(self):
         """Title of current playing media."""
-        if self._playing is not None:
+        if self._playing:
             if self.state == STATE_IDLE:
                 return 'Nothing playing'
             title = self._playing.title
@@ -215,7 +220,7 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             state = self.state
             if state == STATE_PAUSED:
                 return self.atv.remote_control.play()
@@ -227,7 +232,7 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             return self.atv.remote_control.play()
 
     def async_media_stop(self):
@@ -235,7 +240,7 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             return self.atv.remote_control.stop()
 
     def async_media_pause(self):
@@ -243,7 +248,7 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             return self.atv.remote_control.pause()
 
     def async_media_next_track(self):
@@ -251,7 +256,7 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             return self.atv.remote_control.next()
 
     def async_media_previous_track(self):
@@ -259,7 +264,7 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             return self.atv.remote_control.previous()
 
     def async_media_seek(self, position):
@@ -267,5 +272,5 @@ class AppleTvDevice(MediaPlayerDevice):
 
         This method must be run in the event loop and returns a coroutine.
         """
-        if self._playing is not None:
+        if self._playing:
             return self.atv.remote_control.set_position(position)