catch exception in metadata
authormarcelveldt <marcelvanderveldt@MacBook-Pro.local>
Sat, 16 Nov 2019 21:19:37 +0000 (22:19 +0100)
committermarcelveldt <marcelvanderveldt@MacBook-Pro.local>
Sat, 16 Nov 2019 21:19:37 +0000 (22:19 +0100)
music_assistant/metadata.py
music_assistant/playerproviders/squeezebox.py

index 7c35e708d5a4d0166ed99572a61e4c38f2e35bf4..ae8271d7433a83b68251429576c04f35cd29f6ed 100755 (executable)
@@ -176,7 +176,12 @@ class FanartTv():
         params['api_key'] = '639191cb0774661597f28a47e7e2bad5'
         async with self.throttler:
             async with self.http_session.get(url, params=params, verify_ssl=False) as response:
-                result = await response.json()
+                try:
+                    result = await response.json()
+                except aiohttp.client_exceptions.ContentTypeError:
+                    text_result = await response.text()
+                    LOGGER.error(text_result)
+                    return None
                 if 'error' in result and 'limit' in result['error']:
                     raise Exception(result['error'])
                 return result
index 94b05691c74ac6b7154d37cc5617249341b75217..f7364944a264f7a123823d15a1e7787dac958443 100644 (file)
@@ -229,7 +229,6 @@ class PySqueezePlayer(Player):
         request = "GET %s HTTP/1.0\r\n%s\r\n" % (uri, headers)
         data = data + request.encode("utf-8")
         await self.__send_frame(b'strm', data)
-        LOGGER.info("Requesting play from squeezebox" )
 
     def __delete__(self, instance):
         ''' make sure the heartbeat task is deleted '''