From: marcelveldt Date: Sat, 16 Nov 2019 21:19:37 +0000 (+0100) Subject: catch exception in metadata X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=e92576d87d727b4df1e4750bbd04311204cfe933;p=music-assistant-server.git catch exception in metadata --- diff --git a/music_assistant/metadata.py b/music_assistant/metadata.py index 7c35e708..ae8271d7 100755 --- a/music_assistant/metadata.py +++ b/music_assistant/metadata.py @@ -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 diff --git a/music_assistant/playerproviders/squeezebox.py b/music_assistant/playerproviders/squeezebox.py index 94b05691..f7364944 100644 --- a/music_assistant/playerproviders/squeezebox.py +++ b/music_assistant/playerproviders/squeezebox.py @@ -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 '''