Allow status.xml as fallback for sound mode

ol-iver · Sep 23, 2024 · c1d760d · c1d760d
1 parent 9f8d03b
commit c1d760d
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/denonavr/soundmode.py b/denonavr/soundmode.py
@@ -88,6 +88,7 @@ class DenonAVRSoundMode(DenonAVRFoundation):
         init=False,
     )
     _setup_lock: asyncio.Lock = attr.ib(default=attr.Factory(asyncio.Lock))
+    _appcommand_active: bool = attr.ib(converter=bool, default=True, init=False)
 
     # Update tags for attributes
     # AppCommand.xml interface
@@ -152,36 +153,43 @@ async def async_update_sound_mode(
         if self._is_setup and not self._support_sound_mode:
             return
 
-        if self._device.use_avr_2016_update:
+        if self._device.use_avr_2016_update and self._appcommand_active:
             try:
                 await self.async_update_attrs_appcommand(
                     self.appcommand_attrs,
                     global_update=global_update,
                     cache_id=cache_id,
                 )
             except (AvrProcessingError, AvrIncompleteResponseError):
-                self._support_sound_mode = False
-                _LOGGER.info("Sound mode not supported")
+                self._appcommand_active = False
+                _LOGGER.debug(
+                    "Appcommand.xml does not support Sound mode. "
+                    "Testing status.xml interface next"
+                )
+            else:
+                if not self._is_setup:
+                    self._support_sound_mode = True
+                    _LOGGER.info("Sound mode supported")
                 return
-        else:
-            urls = [self._device.urls.status, self._device.urls.mainzone]
-            # There are two different options of sound mode tags
+
+        urls = [self._device.urls.status, self._device.urls.mainzone]
+        # There are two different options of sound mode tags
+        try:
+            await self.async_update_attrs_status_xml(
+                self.status_xml_attrs_01, urls, cache_id=cache_id
+            )
+        except AvrProcessingError:
             try:
                 await self.async_update_attrs_status_xml(
-                    self.status_xml_attrs_01, urls, cache_id=cache_id
+                    self.status_xml_attrs_02, urls, cache_id=cache_id
                 )
             except AvrProcessingError:
-                try:
-                    await self.async_update_attrs_status_xml(
-                        self.status_xml_attrs_02, urls, cache_id=cache_id
-                    )
-                except AvrProcessingError:
-                    self._support_sound_mode = False
-                    _LOGGER.info("Sound mode not supported")
-                    return
-
-        self._support_sound_mode = True
+                self._support_sound_mode = False
+                _LOGGER.info("Sound mode not supported")
+                return
+
         if not self._is_setup:
+            self._support_sound_mode = True
             _LOGGER.info("Sound mode supported")
 
     def match_sound_mode(self) -> Optional[str]: