From 837e7affa7ba922710d0939fc800bc6333ae4887 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 23 Jan 2016 17:48:14 +0100 Subject: [PATCH 1/4] only query artwork by track_id if id is available (7.7 vs 7.9 version issue?) --- homeassistant/components/media_player/squeezebox.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/squeezebox.py b/homeassistant/components/media_player/squeezebox.py index 0494b29fedb..69b15251144 100644 --- a/homeassistant/components/media_player/squeezebox.py +++ b/homeassistant/components/media_player/squeezebox.py @@ -202,9 +202,12 @@ class SqueezeBoxDevice(MediaPlayerDevice): """ Image url of current playing media. """ if 'artwork_url' in self._status: media_url = self._status['artwork_url'] - else: + elif "id" in self._status: media_url = ('/music/{track_id}/cover.jpg').format( track_id=self._status["id"]) + else: + media_url = ('/music/current/cover.jpg?player={player}').format( + player=self.id) base_url = 'http://{server}:{port}/'.format( server=self._lms.host, From b3beb9f3c90c3356fb9b05a35c6fb2df88cdd509 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 23 Jan 2016 18:08:54 +0100 Subject: [PATCH 2/4] style --- homeassistant/components/media_player/squeezebox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/squeezebox.py b/homeassistant/components/media_player/squeezebox.py index 69b15251144..e06f1d3800b 100644 --- a/homeassistant/components/media_player/squeezebox.py +++ b/homeassistant/components/media_player/squeezebox.py @@ -202,7 +202,7 @@ class SqueezeBoxDevice(MediaPlayerDevice): """ Image url of current playing media. """ if 'artwork_url' in self._status: media_url = self._status['artwork_url'] - elif "id" in self._status: + elif 'id' in self._status: media_url = ('/music/{track_id}/cover.jpg').format( track_id=self._status["id"]) else: From 492c4b7f00b2cb004e4b4f28c58479c36cc348b2 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 23 Jan 2016 18:14:03 +0100 Subject: [PATCH 3/4] style --- homeassistant/components/media_player/squeezebox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/squeezebox.py b/homeassistant/components/media_player/squeezebox.py index e06f1d3800b..c0267489f6a 100644 --- a/homeassistant/components/media_player/squeezebox.py +++ b/homeassistant/components/media_player/squeezebox.py @@ -204,7 +204,7 @@ class SqueezeBoxDevice(MediaPlayerDevice): media_url = self._status['artwork_url'] elif 'id' in self._status: media_url = ('/music/{track_id}/cover.jpg').format( - track_id=self._status["id"]) + track_id=self._status['id']) else: media_url = ('/music/current/cover.jpg?player={player}').format( player=self.id) From ec2b433733507566eff510570c20cdc1735ef42a Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 23 Jan 2016 18:55:43 +0100 Subject: [PATCH 4/4] should be _id --- homeassistant/components/media_player/squeezebox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/squeezebox.py b/homeassistant/components/media_player/squeezebox.py index c0267489f6a..05cbb683a52 100644 --- a/homeassistant/components/media_player/squeezebox.py +++ b/homeassistant/components/media_player/squeezebox.py @@ -207,7 +207,7 @@ class SqueezeBoxDevice(MediaPlayerDevice): track_id=self._status['id']) else: media_url = ('/music/current/cover.jpg?player={player}').format( - player=self.id) + player=self._id) base_url = 'http://{server}:{port}/'.format( server=self._lms.host,