denonavr 1.1.2__py3-none-any.whl → 1.3.0__py3-none-any.whl

denonavr/volume.py

@@ -16,14 +16,14 @@ import attr
 from .appcommand import AppCommands
 from .const import (
     CHANNEL_MAP,
-    CHANNEL_MAP_LABELS,
+    CHANNEL_MAP_REVERSE,
     CHANNEL_VOLUME_MAP,
-    CHANNEL_VOLUME_MAP_LABELS,
+    CHANNEL_VOLUME_MAP_REVERSE,
     DENON_ATTR_SETATTR,
     MAIN_ZONE,
     STATE_ON,
     SUBWOOFERS_MAP,
-    SUBWOOFERS_MAP_LABELS,
+    SUBWOOFERS_MAP_REVERSE,
     Channels,
     Subwoofers,
 )
@@ -82,25 +82,17 @@ class DenonAVRVolume(DenonAVRFoundation):
         for tag in self.appcommand_attrs:
             self._device.api.add_appcommand_update_tag(tag)
 
-        self._device.telnet_api.register_callback("MV", self._async_volume_callback)
-        self._device.telnet_api.register_callback("MU", self._async_mute_callback)
-        self._device.telnet_api.register_callback(
-            "CV", self._async_channel_volume_callback
-        )
-        self._device.telnet_api.register_callback(
-            "PS", self._async_subwoofer_state_callback
-        )
-        self._device.telnet_api.register_callback(
-            "PS", self._async_subwoofer_levels_callback
-        )
-        self._device.telnet_api.register_callback("PS", self._async_lfe_callback)
-        self._device.telnet_api.register_callback("PS", self._async_bass_sync_callback)
+        self._device.telnet_api.register_callback("MV", self._volume_callback)
+        self._device.telnet_api.register_callback("MU", self._mute_callback)
+        self._device.telnet_api.register_callback("CV", self._channel_volume_callback)
+        self._device.telnet_api.register_callback("PS", self._subwoofer_state_callback)
+        self._device.telnet_api.register_callback("PS", self._subwoofer_levels_callback)
+        self._device.telnet_api.register_callback("PS", self._lfe_callback)
+        self._device.telnet_api.register_callback("PS", self._bass_sync_callback)
 
         self._is_setup = True
 
-    async def _async_volume_callback(
-        self, zone: str, event: str, parameter: str
-    ) -> None:
+    def _volume_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a volume change event."""
         if self._device.zone != zone:
             return
@@ -112,16 +104,14 @@ class DenonAVRVolume(DenonAVRFoundation):
             fraction = 0.1 * float(parameter[2])
             self._volume = -80.0 + whole_number + fraction
 
-    async def _async_mute_callback(self, zone: str, event: str, parameter: str) -> None:
+    def _mute_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a muting change event."""
         if self._device.zone != zone:
             return
 
         self._muted = parameter
 
-    async def _async_channel_volume_callback(
-        self, zone: str, event: str, parameter: str
-    ) -> None:
+    def _channel_volume_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a channel volume change event."""
         if event != "CV":
             return
@@ -129,7 +119,7 @@ class DenonAVRVolume(DenonAVRFoundation):
         channel_volume = parameter.split()
         if (
             len(channel_volume) != 2
-            or channel_volume[0] not in CHANNEL_MAP_LABELS
+            or channel_volume[0] not in CHANNEL_MAP
             or channel_volume[1] not in CHANNEL_VOLUME_MAP
         ):
             return
@@ -137,35 +127,28 @@ class DenonAVRVolume(DenonAVRFoundation):
         if self._channel_volumes is None:
             self._channel_volumes = {}
 
-        channel = CHANNEL_MAP_LABELS[channel_volume[0]]
+        channel = CHANNEL_MAP[channel_volume[0]]
         volume = channel_volume[1]
         self._channel_volumes[channel] = CHANNEL_VOLUME_MAP[volume]
 
-    async def _async_subwoofer_state_callback(
-        self, zone: str, event: str, parameter: str
-    ) -> None:
+    def _subwoofer_state_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a subwoofer state change event."""
         if parameter[:3] == "SWR":
             self._subwoofer = parameter[4:]
 
-    async def _async_subwoofer_levels_callback(
-        self, zone: str, event: str, parameter: str
-    ) -> None:
+    def _subwoofer_levels_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a subwoofer levels change event."""
         if parameter[:3] != "SWL":
             return
 
         subwoofer_volume = parameter.split()
-        if (
-            len(subwoofer_volume) != 2
-            or subwoofer_volume[0] not in SUBWOOFERS_MAP_LABELS
-        ):
+        if len(subwoofer_volume) != 2 or subwoofer_volume[0] not in SUBWOOFERS_MAP:
             return
 
         if self._subwoofer_levels is None:
             self._subwoofer_levels = {}
 
-        subwoofer = SUBWOOFERS_MAP_LABELS[subwoofer_volume[0]]
+        subwoofer = SUBWOOFERS_MAP[subwoofer_volume[0]]
         level = subwoofer_volume[1]
         val = convert_on_off_bool(level)
         if val is not None:
@@ -173,16 +156,14 @@ class DenonAVRVolume(DenonAVRFoundation):
         elif level in CHANNEL_VOLUME_MAP:
             self._subwoofer_levels[subwoofer] = CHANNEL_VOLUME_MAP[level]
 
-    async def _async_lfe_callback(self, zone: str, event: str, parameter: str) -> None:
+    def _lfe_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a LFE change event."""
         if parameter[:3] != "LFE":
             return
 
         self._lfe = int(parameter[4:]) * -1
 
-    async def _async_bass_sync_callback(
-        self, zone: str, event: str, parameter: str
-    ) -> None:
+    def _bass_sync_callback(self, zone: str, event: str, parameter: str) -> None:
         """Handle a LFE change event."""
         if parameter[:3] != "BSC":
             return
@@ -322,7 +303,7 @@ class DenonAVRVolume(DenonAVRFoundation):
     # Setter #
     ##########
     async def async_volume_up(self) -> None:
-        """Volume up receiver via HTTP get command."""
+        """Volume up receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_volume_up, skip_confirmation=True
@@ -333,7 +314,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_volume_down(self) -> None:
-        """Volume down receiver via HTTP get command."""
+        """Volume down receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_volume_down, skip_confirmation=True
@@ -345,7 +326,7 @@ class DenonAVRVolume(DenonAVRFoundation):
 
     async def async_set_volume(self, volume: float) -> None:
         """
-        Set receiver volume via HTTP get command.
+        Set receiver volume.
 
         Volume is send in a format like -50.0.
         Minimum is -80.0, maximum at 18.0
@@ -367,7 +348,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_mute(self, mute: bool) -> None:
-        """Mute receiver via HTTP get command."""
+        """Mute receiver."""
         if mute:
             if self._device.telnet_available:
                 await self._device.telnet_api.async_send_commands(
@@ -388,10 +369,10 @@ class DenonAVRVolume(DenonAVRFoundation):
                 )
 
     async def async_channel_volume_up(self, channel: Channels) -> None:
-        """Increase Channel volume on receiver via HTTP get command."""
+        """Increase Channel volume on receiver."""
         self._is_valid_channel(channel)
 
-        mapped_channel = CHANNEL_MAP[channel]
+        mapped_channel = CHANNEL_MAP_REVERSE[channel]
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_channel_volume.format(
@@ -406,10 +387,10 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_channel_volume_down(self, channel: Channels) -> None:
-        """Decrease Channel volume on receiver via HTTP get command."""
+        """Decrease Channel volume on receiver."""
         self._is_valid_channel(channel)
 
-        mapped_channel = CHANNEL_MAP[channel]
+        mapped_channel = CHANNEL_MAP_REVERSE[channel]
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_channel_volume.format(
@@ -425,17 +406,17 @@ class DenonAVRVolume(DenonAVRFoundation):
 
     async def async_channel_volume(self, channel: Channels, volume: float) -> None:
         """
-        Set Channel volume on receiver via HTTP get command.
+        Set Channel volume on receiver.
 
         :param channel: Channel to set.
         :param volume: Volume to set. Valid values are -12 to 12 with 0.5 steps.
         """
         self._is_valid_channel(channel)
-        if volume not in CHANNEL_VOLUME_MAP_LABELS:
+        if volume not in CHANNEL_VOLUME_MAP_REVERSE:
             raise AvrCommandError(f"Invalid channel volume: {volume}")
 
-        mapped_channel = CHANNEL_MAP[channel]
-        mapped_volume = CHANNEL_VOLUME_MAP_LABELS[volume]
+        mapped_channel = CHANNEL_MAP_REVERSE[channel]
+        mapped_volume = CHANNEL_VOLUME_MAP_REVERSE[volume]
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_channel_volume.format(
@@ -450,7 +431,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_channel_volumes_reset(self) -> None:
-        """Reset all channel volumes on receiver via HTTP get command."""
+        """Reset all channel volumes on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_channel_volumes_reset
@@ -461,7 +442,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_subwoofer_on(self) -> None:
-        """Turn on Subwoofer on receiver via HTTP get command."""
+        """Turn on Subwoofer on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_subwoofer_on_off.format(mode="ON")
@@ -472,7 +453,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_subwoofer_off(self) -> None:
-        """Turn off Subwoofer on receiver via HTTP get command."""
+        """Turn off Subwoofer on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_subwoofer_on_off.format(mode="OFF")
@@ -484,7 +465,7 @@ class DenonAVRVolume(DenonAVRFoundation):
 
     async def async_subwoofer_toggle(self) -> None:
         """
-        Toggle Subwoofer on receiver via HTTP get command.
+        Toggle Subwoofer on receiver.
 
         Only available if using Telnet.
         """
@@ -494,9 +475,9 @@ class DenonAVRVolume(DenonAVRFoundation):
             await self.async_subwoofer_on()
 
     async def async_subwoofer_level_up(self, subwoofer: Subwoofers) -> None:
-        """Increase Subwoofer level on receiver via HTTP get command."""
+        """Increase Subwoofer level on receiver."""
         self._is_valid_subwoofer(subwoofer)
-        mapped_subwoofer = SUBWOOFERS_MAP[subwoofer]
+        mapped_subwoofer = SUBWOOFERS_MAP_REVERSE[subwoofer]
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_subwoofer_level.format(
@@ -511,9 +492,9 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_subwoofer_level_down(self, subwoofer: Subwoofers) -> None:
-        """Decrease Subwoofer level on receiver via HTTP get command."""
+        """Decrease Subwoofer level on receiver."""
         self._is_valid_subwoofer(subwoofer)
-        mapped_subwoofer = SUBWOOFERS_MAP[subwoofer]
+        mapped_subwoofer = SUBWOOFERS_MAP_REVERSE[subwoofer]
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_subwoofer_level.format(
@@ -528,7 +509,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_lfe_up(self) -> None:
-        """Increase LFE on receiver via HTTP get command."""
+        """Increase LFE on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_lfe.format(mode="UP")
@@ -539,7 +520,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_lfe_down(self) -> None:
-        """Decrease LFE on receiver via HTTP get command."""
+        """Decrease LFE on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_lfe.format(mode="DOWN")
@@ -551,7 +532,7 @@ class DenonAVRVolume(DenonAVRFoundation):
 
     async def async_lfe(self, lfe: int) -> None:
         """
-        Set LFE level on receiver via HTTP get command.
+        Set LFE level on receiver.
 
         :param lfe: LFE level to set. Valid values are -10 to 0.
         """
@@ -569,7 +550,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_bass_sync_up(self) -> None:
-        """Increase Bass Sync on receiver via HTTP get command."""
+        """Increase Bass Sync on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_bass_sync.format(mode="UP")
@@ -580,7 +561,7 @@ class DenonAVRVolume(DenonAVRFoundation):
             )
 
     async def async_bass_sync_down(self) -> None:
-        """Decrease Bass Sync on receiver via HTTP get command."""
+        """Decrease Bass Sync on receiver."""
         if self._device.telnet_available:
             await self._device.telnet_api.async_send_commands(
                 self._device.telnet_commands.command_bass_sync.format(mode="DOWN")
@@ -592,7 +573,7 @@ class DenonAVRVolume(DenonAVRFoundation):
 
     async def async_bass_sync(self, lfe: int) -> None:
         """
-        Set Bass Sync level on receiver via HTTP get command.
+        Set Bass Sync level on receiver.
 
         :param lfe: Bass Sync level to set. Valid values are -10 to 0.
         """

{denonavr-1.1.2.dist-info → denonavr-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: denonavr
-Version: 1.1.2
+Version: 1.3.0
 Summary: Automation Library for Denon AVR receivers
 Author-email: Oliver Goetz <scarface@mywoh.de>
 License: MIT
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown; charset=UTF-8
 License-File: LICENSE

denonavr-1.3.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+denonavr/__init__.py,sha256=cJ7BWxEiq3Kk3ckcl9dRjtiECxCraJxo0BOnJeinEfE,1325
+denonavr/api.py,sha256=FzLJzKTrRF8XcNBiXYqwt9AbRyMlwimn-oSaVA2SPR4,35109
+denonavr/appcommand.py,sha256=SAyerOSrPKCcV9ZwIVm-hwYzBsZGY7G4o6m3F7mc9Yc,8823
+denonavr/audyssey.py,sha256=lD_TUJmVvPCrljWCiyfxtMPgPlAfJAgrjlLhDt8_wxE,14740
+denonavr/const.py,sha256=zaIwg7AjgXtFXxiAtQihkohlxtFc_K2-FEIHrn29Dfk,72360
+denonavr/decorators.py,sha256=uXRZ2lEBVwg-8ZdY71miKyaDdDn3C_o8KCYOvar6AUw,2711
+denonavr/denonavr.py,sha256=fGOl5yw36SDCsOVbZSSGMoT31C59EYqEbxEdTKKkuOI,42115
+denonavr/dirac.py,sha256=oFT4NZyOfMbAQG4zRKJb3scGhQYlKzodnGRQKUZWH7Q,2554
+denonavr/exceptions.py,sha256=naP7MCuNH98rv7y_lDdO7ayyvQGywnsfpHhW-o9tKeo,1725
+denonavr/foundation.py,sha256=fsmCAV2bU8i1FNXXPBI_tvqXeNl-OorcXrW25VHQKkk,81112
+denonavr/input.py,sha256=dEQyyX_doIE_dx_VjAjEJBXdDx6JGZu9iYIT7Q2k7RI,44786
+denonavr/soundmode.py,sha256=MHKcSoDv5ZUFzRbpF9Z8H3xLxZCAVaQWu1F8_qzP8MA,48051
+denonavr/ssdp.py,sha256=8G2hUj8s9coxNGlwXiIu8qP6WQaRNlRxGo0dcsSUVHU,7922
+denonavr/tonecontrol.py,sha256=cR4MkaLbDazDgt3WwS7I8KdapQ5p-FC1oUxdobuo1rU,12412
+denonavr/volume.py,sha256=7urW0aOfOtcTEgN-WedbwmFkViCnMvEmW9XiHENIVH8,21580
+denonavr-1.3.0.dist-info/licenses/LICENSE,sha256=hcKXAoZnRee1NRWnxTpKyjKCz4aHhw76sZUZoB3qPTw,1068
+denonavr-1.3.0.dist-info/METADATA,sha256=45KkULF3mTZfItwq5KxQRXffNZ1Iy7CrqTAoOHki0S8,4758
+denonavr-1.3.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+denonavr-1.3.0.dist-info/top_level.txt,sha256=GKwe6bOaw_R68BR7x-C7VD3bDFKKNBf0pRkWywUZWIs,9
+denonavr-1.3.0.dist-info/RECORD,,

{denonavr-1.1.2.dist-info → denonavr-1.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

denonavr-1.1.2.dist-info/RECORD

@@ -1,20 +0,0 @@
-denonavr/__init__.py,sha256=XIZmlMTDfp6bJzeFlhfUaTmfz0pNiyaNyjW9yzTfEbE,1325
-denonavr/api.py,sha256=5LknKLIXZVPuQ8EYqcf6vAxo4M8ll8wGkoDM40b0sZ4,32555
-denonavr/appcommand.py,sha256=H37VK4n-yW0ISvR1hfX8G4udQtGASoY44QNaXtLSidE,7784
-denonavr/audyssey.py,sha256=d7mSkRiMvrZMtCzQdixfJuLmkuZeSi1w1GgQ_1fm-j8,14655
-denonavr/const.py,sha256=l2WXqSIPxGAJwlP4tJ8ay3dZyPWXiT3_nhlApQY2hRE,55456
-denonavr/decorators.py,sha256=tLoVjGtDmN75fhwCgNREMGjbB6varDERnYlrhC6yIZ8,2733
-denonavr/denonavr.py,sha256=lN_xwG9sa1TYCZQi24FRq4p4jV6GaOuDefYGuLvvXGI,39823
-denonavr/dirac.py,sha256=bRAxdfHRCfYT7nw68ggegXbMsMpmaoqh2foz5qh_Ikw,2595
-denonavr/exceptions.py,sha256=naP7MCuNH98rv7y_lDdO7ayyvQGywnsfpHhW-o9tKeo,1725
-denonavr/foundation.py,sha256=rFYntu5VBJqJEv5da9bgC9W8pG_xyBBiO6IyVUlUmLc,73593
-denonavr/input.py,sha256=kbKPePkdFHQSHKzOvAYudeSyJiRrUh0PxIOkG38kDUo,43050
-denonavr/soundmode.py,sha256=ONMVzD4FPM8PvNrLIG_HjJeAaM5DNp4jvC2mGqXzEI8,44392
-denonavr/ssdp.py,sha256=4gyvN0yo9qSnJ7l6iJmSC_5qW45Fq2Tt2RACpxFMSqg,7839
-denonavr/tonecontrol.py,sha256=DfHzziEeLdYiyTbJKcGk5cCPTvKBgjMqQReYp0qoF0U,12474
-denonavr/volume.py,sha256=qnsYr4AWfCu8MQH9mdw1qsaLo3-Sq1mdzreYQDhaTXQ,22260
-denonavr-1.1.2.dist-info/licenses/LICENSE,sha256=hcKXAoZnRee1NRWnxTpKyjKCz4aHhw76sZUZoB3qPTw,1068
-denonavr-1.1.2.dist-info/METADATA,sha256=Y73wPSRIMHvVbx89acau-UY_hWDbgJiuTOH1Hl3hJE4,4707
-denonavr-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-denonavr-1.1.2.dist-info/top_level.txt,sha256=GKwe6bOaw_R68BR7x-C7VD3bDFKKNBf0pRkWywUZWIs,9
-denonavr-1.1.2.dist-info/RECORD,,