From b768c9cc64eae83f149c9a1359041c8d08466dc9 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Mon, 27 Apr 2020 21:57:57 +0200 Subject: [PATCH] Arcam fmj bump library to 0.4.4 (#34687) * Bump arcam-fmj with better connection failed support * Log unexpected exceptions in arcam client * Consider undetected as 2ch to match OSD * Ask for explicit update on start --- homeassistant/components/arcam_fmj/__init__.py | 5 +++++ homeassistant/components/arcam_fmj/manifest.json | 2 +- homeassistant/components/arcam_fmj/media_player.py | 10 ++++++++-- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/arcam_fmj/__init__.py b/homeassistant/components/arcam_fmj/__init__.py index 59bcd08a641..aa11e66d49c 100644 --- a/homeassistant/components/arcam_fmj/__init__.py +++ b/homeassistant/components/arcam_fmj/__init__.py @@ -162,3 +162,8 @@ async def _run_client(hass, client, interval): await asyncio.sleep(interval) except asyncio.TimeoutError: continue + except asyncio.CancelledError: + return + except Exception: # pylint: disable=broad-except + _LOGGER.exception("Unexpected exception, aborting arcam client") + return diff --git a/homeassistant/components/arcam_fmj/manifest.json b/homeassistant/components/arcam_fmj/manifest.json index 5508f4b6869..c304d7bf351 100644 --- a/homeassistant/components/arcam_fmj/manifest.json +++ b/homeassistant/components/arcam_fmj/manifest.json @@ -3,6 +3,6 @@ "name": "Arcam FMJ Receivers", "config_flow": false, "documentation": "https://www.home-assistant.io/integrations/arcam_fmj", - "requirements": ["arcam-fmj==0.4.3"], + "requirements": ["arcam-fmj==0.4.4"], "codeowners": ["@elupus"] } diff --git a/homeassistant/components/arcam_fmj/media_player.py b/homeassistant/components/arcam_fmj/media_player.py index c9e0c8b8e37..125b3bf96b1 100644 --- a/homeassistant/components/arcam_fmj/media_player.py +++ b/homeassistant/components/arcam_fmj/media_player.py @@ -57,7 +57,8 @@ async def async_setup_entry( zone_config.get(SERVICE_TURN_ON), ) for zone, zone_config in config[CONF_ZONE].items() - ] + ], + True, ) return True @@ -86,7 +87,12 @@ class ArcamFmj(MediaPlayerEntity): audio_format, _ = self._state.get_incoming_audio_format() return bool( audio_format - in (IncomingAudioFormat.PCM, IncomingAudioFormat.ANALOGUE_DIRECT, None) + in ( + IncomingAudioFormat.PCM, + IncomingAudioFormat.ANALOGUE_DIRECT, + IncomingAudioFormat.UNDETECTED, + None, + ) ) @property diff --git a/requirements_all.txt b/requirements_all.txt index 1b1924b2b28..5f3a3a8977e 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -260,7 +260,7 @@ aprslib==0.6.46 aqualogic==1.0 # homeassistant.components.arcam_fmj -arcam-fmj==0.4.3 +arcam-fmj==0.4.4 # homeassistant.components.arris_tg2492lg arris-tg2492lg==1.0.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index d16c18ee149..cea7c6df1a4 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -119,7 +119,7 @@ apprise==0.8.5 aprslib==0.6.46 # homeassistant.components.arcam_fmj -arcam-fmj==0.4.3 +arcam-fmj==0.4.4 # homeassistant.components.dlna_dmr # homeassistant.components.upnp