denonavr 0.11.2__py3-none-any.whl → 0.11.6__py3-none-any.whl

denonavr/tonecontrol.py

@@ -9,7 +9,8 @@ This module implements the handler for state of Denon AVR receivers.
 
 import logging
 import time
-from typing import Hashable, Optional
+from collections.abc import Hashable
+from typing import Optional
 
 import attr
 
@@ -68,14 +69,14 @@ class DenonAVRToneControl(DenonAVRFoundation):
             return
 
         if parameter[0:3] == "BAS":
-            self._bass = int(parameter[4:])
-            self._bass_level = "{}dB".format(self._bass - 50)
+            self._bass = int(parameter[4:]) - 44
+            self._bass_level = f"{int(parameter[4:]) - 50}dB"
         elif parameter[0:3] == "TRE":
-            self._treble = int(parameter[4:])
-            self._treble_level = "{}dB".format(self._treble - 50)
+            self._treble = int(parameter[4:]) - 44
+            self._treble_level = f"{int(parameter[4:]) - 50}dB"
         elif parameter == "TONE CTRL OFF":
             self._tone_control_adjust = False
-            self._tone_control_status = False
+            self._tone_control_status = True
         elif parameter == "TONE CTRL ON":
             self._tone_control_adjust = True
             self._tone_control_status = True
@@ -85,7 +86,7 @@ class DenonAVRToneControl(DenonAVRFoundation):
     ) -> None:
         """Update volume asynchronously."""
         # Ensure instance is setup before updating
-        if self._is_setup is False:
+        if not self._is_setup:
             self.setup()
 
         # Update state
@@ -97,20 +98,19 @@ class DenonAVRToneControl(DenonAVRFoundation):
         self, global_update: bool = False, cache_id: Optional[Hashable] = None
     ):
         """Update tone control status of device."""
-        if self._device.use_avr_2016_update is True:
+        if self._device.use_avr_2016_update is None:
+            raise AvrProcessingError(
+                "Device is not setup correctly, update method not set"
+            )
+
+        # Tone control is only available for avr 2016 update
+        if self._device.use_avr_2016_update:
             await self.async_update_attrs_appcommand(
                 self.appcommand_attrs,
                 global_update=global_update,
                 cache_id=cache_id,
                 ignore_missing_response=True,
             )
-        elif self._device.use_avr_2016_update is False:
-            # Not available
-            pass
-        else:
-            raise AvrProcessingError(
-                "Device is not setup correctly, update method not set"
-            )
 
     async def async_set_tone_control_command(
         self, parameter_type: str, value: int
@@ -129,6 +129,16 @@ class DenonAVRToneControl(DenonAVRFoundation):
     ##############
     # Properties #
     ##############
+    @property
+    def tone_control_status(self) -> Optional[bool]:
+        """Return value of tone control status."""
+        return self._tone_control_status
+
+    @property
+    def tone_control_adjust(self) -> Optional[bool]:
+        """Return value of tone control adjust."""
+        return self._tone_control_adjust
+
     @property
     def bass(self) -> Optional[int]:
         """Return value of bass."""
@@ -154,21 +164,28 @@ class DenonAVRToneControl(DenonAVRFoundation):
     ##########
     async def async_enable_tone_control(self) -> None:
         """Enable tone control to change settings like bass or treble."""
-        if self._tone_control_status is False:
+        if self._tone_control_status is None:
             raise AvrCommandError(
                 "Cannot enable tone control, Dynamic EQ must be deactivated"
             )
 
-        await self.async_set_tone_control_command("adjust", 1)
+        if self._device.telnet_available:
+            telnet_command = self._device.telnet_commands.command_tonecontrol + "ON"
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_set_tone_control_command("adjust", 1)
 
     async def async_disable_tone_control(self) -> None:
         """Disable tone control to change settings like bass or treble."""
-        if self._tone_control_status is False:
+        if self._tone_control_status is None:
             raise AvrCommandError(
                 "Cannot disable tone control, Dynamic EQ must be deactivated"
             )
-
-        await self.async_set_tone_control_command("adjust", 0)
+        if self._device.telnet_available:
+            telnet_command = self._device.telnet_commands.command_tonecontrol + "OFF"
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_set_tone_control_command("adjust", 0)
 
     async def async_set_bass(self, value: int) -> None:
         """
@@ -181,8 +198,14 @@ class DenonAVRToneControl(DenonAVRFoundation):
         """
         if value < 0 or value > 12:
             raise AvrCommandError("Invalid value for bass")
-        await self.async_enable_tone_control()
-        await self.async_set_tone_control_command("bassvalue", value)
+        if self._device.telnet_available:
+            if not self.tone_control_adjust:
+                await self.async_enable_tone_control()
+            telnet_command = self._device.telnet_commands.command_bass + str(value + 44)
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_enable_tone_control()
+            await self.async_set_tone_control_command("bassvalue", value)
 
     async def async_bass_up(self) -> None:
         """
@@ -193,9 +216,15 @@ class DenonAVRToneControl(DenonAVRFoundation):
         """
         if self.bass == 12:
             return
-        await self.async_enable_tone_control()
-        await self.async_set_tone_control_command("bassvalue", self.bass + 1)
-        await self.async_update()
+        if self._device.telnet_available:
+            if not self.tone_control_adjust:
+                await self.async_enable_tone_control()
+            telnet_command = self._device.telnet_commands.command_bass + "UP"
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_enable_tone_control()
+            await self.async_set_tone_control_command("bassvalue", self.bass + 1)
+            await self.async_update()
 
     async def async_bass_down(self) -> None:
         """
@@ -206,9 +235,15 @@ class DenonAVRToneControl(DenonAVRFoundation):
         """
         if self.bass == 0:
             return
-        await self.async_enable_tone_control()
-        await self.async_set_tone_control_command("bassvalue", self.bass - 1)
-        await self.async_update()
+        if self._device.telnet_available:
+            if not self.tone_control_adjust:
+                await self.async_enable_tone_control()
+            telnet_command = self._device.telnet_commands.command_bass + "DOWN"
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_enable_tone_control()
+            await self.async_set_tone_control_command("bassvalue", self.bass - 1)
+            await self.async_update()
 
     async def async_set_treble(self, value: int) -> None:
         """
@@ -221,8 +256,16 @@ class DenonAVRToneControl(DenonAVRFoundation):
         """
         if value < 0 or value > 12:
             raise AvrCommandError("Invalid value for treble")
-        await self.async_enable_tone_control()
-        await self.async_set_tone_control_command("treblevalue", value)
+        if self._device.telnet_available:
+            if not self.tone_control_adjust:
+                await self.async_enable_tone_control()
+            telnet_command = self._device.telnet_commands.command_treble + str(
+                value + 44
+            )
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_enable_tone_control()
+            await self.async_set_tone_control_command("treblevalue", value)
 
     async def async_treble_up(self) -> None:
         """
@@ -233,9 +276,15 @@ class DenonAVRToneControl(DenonAVRFoundation):
         """
         if self.treble == 12:
             return
-        await self.async_enable_tone_control()
-        await self.async_set_tone_control_command("treblevalue", self.treble + 1)
-        await self.async_update()
+        if self._device.telnet_available:
+            if not self.tone_control_adjust:
+                await self.async_enable_tone_control()
+            telnet_command = self._device.telnet_commands.command_treble + "UP"
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_enable_tone_control()
+            await self.async_set_tone_control_command("treblevalue", self.treble + 1)
+            await self.async_update()
 
     async def async_treble_down(self) -> None:
         """
@@ -246,9 +295,15 @@ class DenonAVRToneControl(DenonAVRFoundation):
         """
         if self.treble == 0:
             return
-        await self.async_enable_tone_control()
-        await self.async_set_tone_control_command("treblevalue", self.treble - 1)
-        await self.async_update()
+        if self._device.telnet_available:
+            if not self.tone_control_adjust:
+                await self.async_enable_tone_control()
+            telnet_command = self._device.telnet_commands.command_treble + "DOWN"
+            await self._device.telnet_api.async_send_commands(telnet_command)
+        else:
+            await self.async_enable_tone_control()
+            await self.async_set_tone_control_command("treblevalue", self.treble - 1)
+            await self.async_update()
 
 
 def tone_control_factory(instance: DenonAVRFoundation) -> DenonAVRToneControl:

denonavr/volume.py

@@ -8,7 +8,8 @@ This module implements the handler for volume of Denon AVR receivers.
 """
 
 import logging
-from typing import Hashable, Optional, Union
+from collections.abc import Hashable
+from typing import Optional, Union
 
 import attr
 
@@ -89,7 +90,7 @@ class DenonAVRVolume(DenonAVRFoundation):
     ) -> None:
         """Update volume asynchronously."""
         # Ensure instance is setup before updating
-        if self._is_setup is False:
+        if not self._is_setup:
             self.setup()
 
         # Update state
@@ -99,21 +100,22 @@ class DenonAVRVolume(DenonAVRFoundation):
         self, global_update: bool = False, cache_id: Optional[Hashable] = None
     ):
         """Update volume status of device."""
-        if self._device.use_avr_2016_update is True:
+        if self._device.use_avr_2016_update is None:
+            raise AvrProcessingError(
+                "Device is not setup correctly, update method not set"
+            )
+
+        if self._device.use_avr_2016_update:
             await self.async_update_attrs_appcommand(
                 self.appcommand_attrs, global_update=global_update, cache_id=cache_id
             )
-        elif self._device.use_avr_2016_update is False:
+        else:
             urls = [self._device.urls.status]
             if self._device.zone == MAIN_ZONE:
                 urls.append(self._device.urls.mainzone)
             await self.async_update_attrs_status_xml(
                 self.status_xml_attrs, urls, cache_id=cache_id
             )
-        else:
-            raise AvrProcessingError(
-                "Device is not setup correctly, update method not set"
-            )
 
     ##############
     # Properties #
@@ -142,11 +144,25 @@ class DenonAVRVolume(DenonAVRFoundation):
     ##########
     async def async_volume_up(self) -> None:
         """Volume up receiver via HTTP get command."""
-        await self._device.api.async_get_command(self._device.urls.command_volume_up)
+        if self._device.telnet_available:
+            await self._device.telnet_api.async_send_commands(
+                self._device.telnet_commands.command_volume_up
+            )
+        else:
+            await self._device.api.async_get_command(
+                self._device.urls.command_volume_up
+            )
 
     async def async_volume_down(self) -> None:
         """Volume down receiver via HTTP get command."""
-        await self._device.api.async_get_command(self._device.urls.command_volume_down)
+        if self._device.telnet_available:
+            await self._device.telnet_api.async_send_commands(
+                self._device.telnet_commands.command_volume_down
+            )
+        else:
+            await self._device.api.async_get_command(
+                self._device.urls.command_volume_down
+            )
 
     async def async_set_volume(self, volume: float) -> None:
         """
@@ -156,21 +172,41 @@ class DenonAVRVolume(DenonAVRFoundation):
         Minimum is -80.0, maximum at 18.0
         """
         if volume < -80 or volume > 18:
-            raise AvrCommandError("Invalid volume: {}".format(volume))
+            raise AvrCommandError(f"Invalid volume: {volume}")
 
         # Round volume because only values which are a multi of 0.5 are working
         volume = round(volume * 2) / 2.0
-
-        await self._device.api.async_get_command(
-            self._device.urls.command_set_volume.format(volume=volume)
-        )
+        if self._device.telnet_available:
+            await self._device.telnet_api.async_send_commands(
+                self._device.telnet_commands.command_set_volume.format(
+                    volume=int(volume + 80)
+                )
+            )
+        else:
+            await self._device.api.async_get_command(
+                self._device.urls.command_set_volume.format(volume=volume)
+            )
 
     async def async_mute(self, mute: bool) -> None:
         """Mute receiver via HTTP get command."""
         if mute:
-            await self._device.api.async_get_command(self._device.urls.command_mute_on)
+            if self._device.telnet_available:
+                await self._device.telnet_api.async_send_commands(
+                    self._device.telnet_commands.command_mute_on
+                )
+            else:
+                await self._device.api.async_get_command(
+                    self._device.urls.command_mute_on
+                )
         else:
-            await self._device.api.async_get_command(self._device.urls.command_mute_off)
+            if self._device.telnet_available:
+                await self._device.telnet_api.async_send_commands(
+                    self._device.telnet_commands.command_mute_off
+                )
+            else:
+                await self._device.api.async_get_command(
+                    self._device.urls.command_mute_off
+                )
 
 
 def volume_factory(instance: DenonAVRFoundation) -> DenonAVRVolume:

{denonavr-0.11.2.dist-info → denonavr-0.11.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: denonavr
-Version: 0.11.2
+Version: 0.11.6
 Summary: Automation Library for Denon AVR receivers
 Author-email: Oliver Goetz <scarface@mywoh.de>
 License: MIT
@@ -19,15 +19,17 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown; charset=UTF-8
 License-File: LICENSE
-Requires-Dist: asyncstdlib (>=3.10.2)
-Requires-Dist: attrs (>=21.2.0)
-Requires-Dist: defusedxml (>=0.7.1)
-Requires-Dist: httpx (>=0.23.1)
-Requires-Dist: netifaces (>=0.11.0)
-Requires-Dist: async-timeout (>=4.0.2) ; python_version < "3.11"
+Requires-Dist: asyncstdlib >=3.10.2
+Requires-Dist: attrs >=21.2.0
+Requires-Dist: defusedxml >=0.7.1
+Requires-Dist: ftfy >=6.1.1
+Requires-Dist: httpx >=0.23.1
+Requires-Dist: netifaces >=0.11.0
+Requires-Dist: async-timeout >=4.0.2 ; python_version < "3.11"
 Provides-Extra: testing
 Requires-Dist: pydocstyle ; extra == 'testing'
 Requires-Dist: pylint ; extra == 'testing'
@@ -58,7 +60,7 @@ In addition to retrieving the current device status via HTTP calls, this version
 
 As of version 0.10.0 and newer, the `denonavr` library has switched to using`async` methods to interact with Denon receivers.
 
-Legacy synchronous methods are still availlable to avoid breaking existing implementations, but may be deprecated in the future.  Switching to `async` methods is recommended.  The existing sync methods are inefficient because they use the corresponding async methods by starting and stopping its own `asyncio` loop for each command.
+Legacy synchronous methods are still available to avoid breaking existing implementations, but may be deprecated in the future.  Switching to `async` methods is recommended.  The existing sync methods are inefficient because they use the corresponding async methods by starting and stopping its own `asyncio` loop for each command.
 
 ### Other changes:
 
@@ -129,8 +131,8 @@ The `asyncio` library should automatically be imported in the REPL.  Import the
 ```
 ### Sound
 ```
->>> await d.async_mute_on(True)
->>> await d.async_mute_off(False)
+>>> await d.async_mute(True)
+>>> await d.async_mute(False)
 ```
 
 ### Other methods
@@ -284,5 +286,5 @@ MIT
 @bdraco: https://github.com/bdraco  
 
 ## Users
-Home Assistant: https://github.com/home-assistant/home-assistant/
+Home Assistant: https://github.com/home-assistant/home-assistant/  
 denonavr-cli: https://pypi.org/project/denonavr-cli/

denonavr-0.11.6.dist-info/RECORD

@@ -0,0 +1,19 @@
+denonavr/__init__.py,sha256=-divkN4DxZpILQgRgqab1PE7GszFDjdkCdy7aCI63nw,2035
+denonavr/api.py,sha256=8s_TXeUidCDh4wzgbibOaJjZ1Nba5pcbGmKyLhL1m9s,28671
+denonavr/appcommand.py,sha256=H37VK4n-yW0ISvR1hfX8G4udQtGASoY44QNaXtLSidE,7784
+denonavr/audyssey.py,sha256=tbfOerXxjv6l3TAJ4zMBn08UPNqx-tVJEpDhwyYZ3iw,10797
+denonavr/const.py,sha256=7jXrdTrqSrRJsYf_twqersNtdGx6odiMSsCajIHfsPA,17458
+denonavr/decorators.py,sha256=j1Icyfw64LPLD67H2yd9nbREbTvicqG-kAxawfgvXuE,5062
+denonavr/denonavr.py,sha256=hnsYJiVSXD9qaYr6mjlwkQL3I8NrbXXfAo8uWT35HBU,28159
+denonavr/exceptions.py,sha256=naP7MCuNH98rv7y_lDdO7ayyvQGywnsfpHhW-o9tKeo,1725
+denonavr/foundation.py,sha256=lCPxcbpbjbUCSNquNjaW5RXHQXdSR7Q0O8og2hcPXOY,27911
+denonavr/input.py,sha256=kkswPrMiys1Qq7YWfwrveB-w2aaTgXAkkBa05rolbOA,41085
+denonavr/soundmode.py,sha256=G36Nmf6lTe8Ku6sQ-2nDYHjmSjrnNr9l4wq3-B45I1g,11737
+denonavr/ssdp.py,sha256=4gyvN0yo9qSnJ7l6iJmSC_5qW45Fq2Tt2RACpxFMSqg,7839
+denonavr/tonecontrol.py,sha256=jg3d_OnnXKR5mq7S3mtKHyYhg7Y_qmDloqIm7WRJ71U,11093
+denonavr/volume.py,sha256=bGEOyeNGaI4X-7C7hjEBBH4RlFCYngf4Dl2IM8ooxOo,7197
+denonavr-0.11.6.dist-info/LICENSE,sha256=hcKXAoZnRee1NRWnxTpKyjKCz4aHhw76sZUZoB3qPTw,1068
+denonavr-0.11.6.dist-info/METADATA,sha256=0He0qq32YZidhfW5a5K0NjPhojr5Ul1Q5zXip2SeCDs,10361
+denonavr-0.11.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+denonavr-0.11.6.dist-info/top_level.txt,sha256=GKwe6bOaw_R68BR7x-C7VD3bDFKKNBf0pRkWywUZWIs,9
+denonavr-0.11.6.dist-info/RECORD,,

{denonavr-0.11.2.dist-info → denonavr-0.11.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

denonavr-0.11.2.dist-info/RECORD

@@ -1,19 +0,0 @@
-denonavr/__init__.py,sha256=IEE3zELRRUtf7Bn2gkzIBSxDdM7RW6K2DzOPYDj9rmk,2035
-denonavr/api.py,sha256=SRpUMEIWonRE0zkA6-GBQqcArMHHLji9Zl6JYU8gxoo,23824
-denonavr/appcommand.py,sha256=H37VK4n-yW0ISvR1hfX8G4udQtGASoY44QNaXtLSidE,7784
-denonavr/audyssey.py,sha256=tt4XpWpi5RQyFhT0IWMGeHGUTHDdzlLyits9gfRG6JI,8709
-denonavr/const.py,sha256=5zboqVrJfg5Qu6PGUc5snI9ADggJRq-HHY8p8hgZs0I,12932
-denonavr/decorators.py,sha256=0V3PAM2ZNZr911f1W1CXXeTJvOWxqs1S5EjEJkkB53o,5323
-denonavr/denonavr.py,sha256=FbPBV-iSCjbn1Jjgrb9IHUR3bpHlVnL_756L7OSZiBQ,26578
-denonavr/exceptions.py,sha256=naP7MCuNH98rv7y_lDdO7ayyvQGywnsfpHhW-o9tKeo,1725
-denonavr/foundation.py,sha256=Os2A1JxVHQOo0R85O8XbM0XRNzqmL3ZrDbIx9Jxpxik,26828
-denonavr/input.py,sha256=gUQJZZ8pL_9cxQhxl1kCLVzsrl8Rls9qtVazAJpt2x8,39322
-denonavr/soundmode.py,sha256=XBUElzd2y2h4AK73JxBvwvaqFs3ICJMJd0C_UG4XNzA,11009
-denonavr/ssdp.py,sha256=7r8DVb9voIlH09IDNY5iSjhmpyJKf6MlZZanEO7Uqos,8011
-denonavr/tonecontrol.py,sha256=UrK1OAKWKeSacsURsnFcSf21D51_uvcsl6FEZ5o2CTU,8310
-denonavr/volume.py,sha256=T4SgIauLo0btkHmqxY2mqw2x7FZ7o5TKxgOv1654-9A,5940
-denonavr-0.11.2.dist-info/LICENSE,sha256=hcKXAoZnRee1NRWnxTpKyjKCz4aHhw76sZUZoB3qPTw,1068
-denonavr-0.11.2.dist-info/METADATA,sha256=_jk1Tj83X7T7QniPBSt5VLRZ7ZyUj_4hyBBmLmHy3d0,10300
-denonavr-0.11.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-denonavr-0.11.2.dist-info/top_level.txt,sha256=GKwe6bOaw_R68BR7x-C7VD3bDFKKNBf0pRkWywUZWIs,9
-denonavr-0.11.2.dist-info/RECORD,,