denonavr 1.2.0__tar.gz → 1.3.0__tar.gz

{denonavr-1.2.0 → denonavr-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: denonavr
-Version: 1.2.0
+Version: 1.3.0
 Summary: Automation Library for Denon AVR receivers
 Author-email: Oliver Goetz <scarface@mywoh.de>
 License: MIT

{denonavr-1.2.0 → denonavr-1.3.0}/denonavr/__init__.py

@@ -17,7 +17,7 @@ from .ssdp import async_identify_denonavr_receivers
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 __title__ = "denonavr"
-__version__ = "1.2.0"
+__version__ = "1.3.0"
 
 
 async def async_discover():

{denonavr-1.2.0 → denonavr-1.3.0}/denonavr/api.py

@@ -16,7 +16,7 @@ import xml.etree.ElementTree as ET
 from collections import defaultdict
 from collections.abc import Hashable
 from io import BytesIO
-from typing import Callable, DefaultDict, Dict, List, Optional, Set, Tuple, cast
+from typing import Callable, DefaultDict, Dict, List, Optional, Set, Tuple
 
 import attr
 import httpx
@@ -124,7 +124,7 @@ class HTTPXAsyncClient:
         data: Optional[Dict] = None,
         cache_id: Hashable = None,
     ) -> httpx.Response:
-        """Call GET endpoint of Denon AVR receiver asynchronously."""
+        """Call POST endpoint of Denon AVR receiver asynchronously."""
         client = self.client_getter()
         try:
             async with client.stream(
@@ -483,7 +483,7 @@ class DenonAVRTelnetApi:
         default=attr.Factory(asyncio.Event)
     )
     _send_confirmation_command: str = attr.ib(converter=str, default="")
-    _send_tasks: Set[asyncio.Task] = attr.ib(attr.Factory(set))
+    _send_tasks: Set[asyncio.Task] = attr.ib(default=attr.Factory(set))
     _callbacks: Dict[str, List[Callable]] = attr.ib(
         validator=attr.validators.instance_of(dict),
         default=attr.Factory(dict),
@@ -494,7 +494,7 @@ class DenonAVRTelnetApi:
         default=attr.Factory(list),
         init=False,
     )
-    _update_callback_tasks: Set[asyncio.Task] = attr.ib(attr.Factory(set))
+    _update_callback_tasks: Set[asyncio.Task] = attr.ib(default=attr.Factory(set))
 
     def __attrs_post_init__(self) -> None:
         """Initialize special attributes."""
@@ -537,7 +537,7 @@ class DenonAVRTelnetApi:
                 "%s: Connection failed on telnet reconnect: %s", self.host, err
             )
             raise AvrNetworkError(f"OSError: {err}", "telnet connect") from err
-        self._protocol = cast(DenonAVRTelnetProtocol, transport_protocol[1])
+        self._protocol = transport_protocol[1]
         _LOGGER.debug("%s: telnet connection established", self.host)
         self._connection_enabled = True
         self._last_message_time = time.monotonic()
@@ -602,6 +602,8 @@ class DenonAVRTelnetApi:
             "PSIMAXSWO ?",  # Subwoofer Output LFE+Main/LFE
             "PSSWL ?",  # Subwoofer Level
             "STBY?",  # Auto Standby
+            "Z2STBY?",  # Auto Standby
+            "Z3STBY?",  # Auto Standby
             "SLP?",  # Sleep
             "VSVPM ?",  # Video Process
             "PSLFE ?",  # LFE Level

{denonavr-1.2.0 → denonavr-1.3.0}/denonavr/appcommand.py

@@ -30,6 +30,8 @@ class AppCommandResponsePattern:
 
     update_attribute: str = attr.ib(converter=str)
     add_zone: bool = attr.ib(converter=bool, default=True)
+    search_zone_text: bool = attr.ib(converter=bool, default=False)
+    prefix: str = attr.ib(converter=str, default="")
     suffix: str = attr.ib(converter=str, default="")
     get_xml_attribute: Optional[str] = attr.ib(
         converter=attr.converters.optional(str), default=None
@@ -73,7 +75,7 @@ class AppCommands:
     """Collect known AppCommand.xml tags."""
 
     GetAllZoneMuteStatus = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="GetAllZoneMuteStatus",
         response_pattern=(
             AppCommandResponsePattern(
@@ -82,7 +84,7 @@ class AppCommands:
         ),
     )
     GetAllZonePowerStatus = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="GetAllZonePowerStatus",
         response_pattern=(
             AppCommandResponsePattern(
@@ -91,7 +93,7 @@ class AppCommands:
         ),
     )
     GetAllZoneSource = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="GetAllZoneSource",
         response_pattern=(
             AppCommandResponsePattern(
@@ -100,7 +102,7 @@ class AppCommands:
         ),
     )
     GetAllZoneVolume = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="GetAllZoneVolume",
         response_pattern=(
             AppCommandResponsePattern(
@@ -109,8 +111,42 @@ class AppCommands:
         ),
     )
 
+    GetAutoStandby = AppCommandCmd(
+        cmd_id="1",
+        cmd_text="GetAutoStandby",
+        response_pattern=(
+            AppCommandResponsePattern(
+                update_attribute="_auto_standby",
+                add_zone=False,
+                search_zone_text=True,
+                prefix="/list/listvalue/",
+                suffix="/value",
+            ),
+        ),
+    )
+
+    GetDimmer = AppCommandCmd(
+        cmd_id="1",
+        cmd_text="GetDimmer",
+        response_pattern=(
+            AppCommandResponsePattern(
+                update_attribute="_dimmer", add_zone=False, suffix="/value"
+            ),
+        ),
+    )
+
+    GetECO = AppCommandCmd(
+        cmd_id="1",
+        cmd_text="GetECO",
+        response_pattern=(
+            AppCommandResponsePattern(
+                update_attribute="_eco_mode", add_zone=False, suffix="/mode"
+            ),
+        ),
+    )
+
     GetSurroundModeStatus = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="GetSurroundModeStatus",
         response_pattern=(
             AppCommandResponsePattern(
@@ -120,7 +156,7 @@ class AppCommands:
     )
 
     GetToneControl = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="GetToneControl",
         response_pattern=(
             AppCommandResponsePattern(
@@ -149,7 +185,7 @@ class AppCommands:
     )
     # Replace set command with a real command using attr.evolve
     SetToneControl = AppCommandCmd(
-        cmd_id=1,
+        cmd_id="1",
         cmd_text="SetToneControl",
         set_command=AppCommandCmdParam(name="REPLACE", text="REPLACE"),
     )
@@ -160,7 +196,7 @@ class AppCommands:
     GetFriendlyName = AppCommandCmd(cmd_id=1, cmd_text="GetFriendlyName")
 
     GetAudyssey = AppCommandCmd(
-        cmd_id=3,
+        cmd_id="3",
         name="GetAudyssey",
         param_list=(
             AppCommandCmdParam(name="dynamiceq"),
@@ -216,22 +252,22 @@ class AppCommands:
         ),
     )
     SetAudysseyDynamicEQ = AppCommandCmd(
-        cmd_id=3,
+        cmd_id="3",
         name="SetAudyssey",
         param_list=(AppCommandCmdParam(name="dynamiceq", text="REPLACE"),),
     )
     SetAudysseyMultiEQ = AppCommandCmd(
-        cmd_id=3,
+        cmd_id="3",
         name="SetAudyssey",
         param_list=(AppCommandCmdParam(name="multieq", text="REPLACE"),),
     )
     SetAudysseyReflevoffset = AppCommandCmd(
-        cmd_id=3,
+        cmd_id="3",
         name="SetAudyssey",
         param_list=(AppCommandCmdParam(name="reflevoffset", text="REPLACE"),),
     )
     SetAudysseyDynamicvol = AppCommandCmd(
-        cmd_id=3,
+        cmd_id="3",
         name="SetAudyssey",
         param_list=(AppCommandCmdParam(name="dynamicvol", text="REPLACE"),),
     )

{denonavr-1.2.0 → denonavr-1.3.0}/denonavr/audyssey.py

@@ -17,14 +17,17 @@ from .appcommand import AppCommandCmd, AppCommandCmdParam, AppCommands
 from .const import (
     DENON_ATTR_SETATTR,
     DYNAMIC_VOLUME_MAP,
-    DYNAMIC_VOLUME_MAP_LABELS_APPCOMMAND,
-    DYNAMIC_VOLUME_MAP_LABELS_TELNET,
+    DYNAMIC_VOLUME_MAP_REVERSE_APPCOMMAND,
+    DYNAMIC_VOLUME_MAP_REVERSE_TELNET,
     MULTI_EQ_MAP,
-    MULTI_EQ_MAP_LABELS_APPCOMMAND,
-    MULTI_EQ_MAP_LABELS_TELNET,
+    MULTI_EQ_MAP_REVERSE_APPCOMMAND,
+    MULTI_EQ_MAP_REVERSE_TELNET,
     REF_LVL_OFFSET_MAP,
-    REF_LVL_OFFSET_MAP_LABELS_APPCOMMAND,
-    REF_LVL_OFFSET_MAP_LABELS_TELNET,
+    REF_LVL_OFFSET_MAP_REVERSE_APPCOMMAND,
+    REF_LVL_OFFSET_MAP_REVERSE_TELNET,
+    DynamicVolumeSettings,
+    MultiEQModes,
+    ReferenceLevelOffsets,
 )
 from .exceptions import AvrCommandError, AvrProcessingError
 from .foundation import DenonAVRFoundation, convert_string_int_bool
@@ -167,8 +170,8 @@ class DenonAVRAudyssey(DenonAVRFoundation):
     def reference_level_offset_setting_list(self) -> List[str]:
         """Return a list of available reference level offset settings."""
         if self._device.telnet_available:
-            return list(REF_LVL_OFFSET_MAP_LABELS_TELNET.keys())
-        return list(REF_LVL_OFFSET_MAP_LABELS_APPCOMMAND.keys())
+            return list(REF_LVL_OFFSET_MAP_REVERSE_TELNET.keys())
+        return list(REF_LVL_OFFSET_MAP_REVERSE_APPCOMMAND.keys())
 
     @property
     def dynamic_volume(self) -> Optional[str]:
@@ -179,8 +182,8 @@ class DenonAVRAudyssey(DenonAVRFoundation):
     def dynamic_volume_setting_list(self) -> List[str]:
         """Return a list of available Dynamic Volume settings."""
         if self._device.telnet_available:
-            return list(DYNAMIC_VOLUME_MAP_LABELS_TELNET.keys())
-        return list(DYNAMIC_VOLUME_MAP_LABELS_APPCOMMAND.keys())
+            return list(DYNAMIC_VOLUME_MAP_REVERSE_TELNET.keys())
+        return list(DYNAMIC_VOLUME_MAP_REVERSE_APPCOMMAND.keys())
 
     @property
     def multi_eq(self) -> Optional[str]:
@@ -191,8 +194,8 @@ class DenonAVRAudyssey(DenonAVRFoundation):
     def multi_eq_setting_list(self) -> List[str]:
         """Return a list of available MultiEQ settings."""
         if self._device.telnet_available:
-            return list(MULTI_EQ_MAP_LABELS_TELNET.keys())
-        return list(MULTI_EQ_MAP_LABELS_APPCOMMAND.keys())
+            return list(MULTI_EQ_MAP_REVERSE_TELNET.keys())
+        return list(MULTI_EQ_MAP_REVERSE_APPCOMMAND.keys())
 
     @property
     def lfc(self) -> Optional[bool]:
@@ -223,7 +226,7 @@ class DenonAVRAudyssey(DenonAVRFoundation):
             return
         cmd = attr.evolve(
             AppCommands.SetAudysseyDynamicEQ,
-            param_list=(AppCommandCmdParam(name="dynamiceq", text=0),),
+            param_list=(AppCommandCmdParam(name="dynamiceq", text="0"),),
         )
         await self._async_set_audyssey(cmd)
 
@@ -235,21 +238,21 @@ class DenonAVRAudyssey(DenonAVRFoundation):
             return
         cmd = attr.evolve(
             AppCommands.SetAudysseyDynamicEQ,
-            param_list=(AppCommandCmdParam(name="dynamiceq", text=1),),
+            param_list=(AppCommandCmdParam(name="dynamiceq", text="1"),),
         )
         await self._async_set_audyssey(cmd)
 
-    async def async_set_multieq(self, value: str) -> None:
+    async def async_set_multieq(self, value: MultiEQModes) -> None:
         """Set MultiEQ mode."""
         if self._device.telnet_available:
-            setting = MULTI_EQ_MAP_LABELS_TELNET.get(value)
+            setting = MULTI_EQ_MAP_REVERSE_TELNET.get(value)
             if setting is None:
                 raise AvrCommandError(f"Value {value} not known for MultiEQ")
             telnet_command = self._device.telnet_commands.command_multieq + setting
             await self._device.telnet_api.async_send_commands(telnet_command)
             return
 
-        setting = MULTI_EQ_MAP_LABELS_APPCOMMAND.get(value)
+        setting = MULTI_EQ_MAP_REVERSE_APPCOMMAND.get(value)
         if setting is None:
             raise AvrCommandError(f"Value {value} not known for MultiEQ")
         cmd = attr.evolve(
@@ -258,7 +261,7 @@ class DenonAVRAudyssey(DenonAVRFoundation):
         )
         await self._async_set_audyssey(cmd)
 
-    async def async_set_reflevoffset(self, value: str) -> None:
+    async def async_set_reflevoffset(self, value: ReferenceLevelOffsets) -> None:
         """Set Reference Level Offset."""
         # Reference level offset can only be used with DynamicEQ
         if not self._dynamiceq:
@@ -266,7 +269,7 @@ class DenonAVRAudyssey(DenonAVRFoundation):
                 "Reference level could only be set when DynamicEQ is active"
             )
         if self._device.telnet_available:
-            setting = REF_LVL_OFFSET_MAP_LABELS_TELNET.get(value)
+            setting = REF_LVL_OFFSET_MAP_REVERSE_TELNET.get(value)
             if setting is None:
                 raise AvrCommandError(
                     f"Value {value} not known for Reference level offset"
@@ -275,7 +278,7 @@ class DenonAVRAudyssey(DenonAVRFoundation):
             await self._device.telnet_api.async_send_commands(telnet_command)
             return
 
-        setting = REF_LVL_OFFSET_MAP_LABELS_APPCOMMAND.get(value)
+        setting = REF_LVL_OFFSET_MAP_REVERSE_APPCOMMAND.get(value)
         if setting is None:
             raise AvrCommandError(f"Value {value} not known for Reference level offset")
         cmd = attr.evolve(
@@ -284,17 +287,17 @@ class DenonAVRAudyssey(DenonAVRFoundation):
         )
         await self._async_set_audyssey(cmd)
 
-    async def async_set_dynamicvol(self, value: str) -> None:
+    async def async_set_dynamicvol(self, value: DynamicVolumeSettings) -> None:
         """Set Dynamic Volume."""
         if self._device.telnet_available:
-            setting = DYNAMIC_VOLUME_MAP_LABELS_TELNET.get(value)
+            setting = DYNAMIC_VOLUME_MAP_REVERSE_TELNET.get(value)
             if setting is None:
                 raise AvrCommandError(f"Value {value} not known for Dynamic Volume")
             telnet_command = self._device.telnet_commands.command_dynamicvol + setting
             await self._device.telnet_api.async_send_commands(telnet_command)
             return
 
-        setting = DYNAMIC_VOLUME_MAP_LABELS_APPCOMMAND.get(value)
+        setting = DYNAMIC_VOLUME_MAP_REVERSE_APPCOMMAND.get(value)
         if setting is None:
             raise AvrCommandError(f"Value {value} not known for Dynamic Volume")
         cmd = attr.evolve(