From e5e6599b847a6bb9e1288f43ccc35ba0e254fd54 Mon Sep 17 00:00:00 2001
From: albaintor <118518828+albaintor@users.noreply.github.com>
Date: Mon, 18 Mar 2024 14:23:46 +0100
Subject: [PATCH] feat: Added additional commands: DPAD and menus (#36)

Co-authored-by: BAIN THOUVEREZ Damien DTSI/BLI <MDFJ2016@orange.com>
---
 .idea/misc.xml                |   4 +-
 intg-denonavr/avr.py          | 103 ++++++++++++++++++++++++++++++++++
 intg-denonavr/media_player.py |  22 ++++++++
 requirements.txt              |   4 +-
 4 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 15b54bd..88dff7b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,7 +6,5 @@
     <option name="enabledOnSave" value="true" />
     <option name="sdkName" value="Python 3.11 (integration-denonavr)" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="Python 3.11 (integration-denonavr)" project-jdk-type="Python SDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/intg-denonavr/avr.py b/intg-denonavr/avr.py
index a3b1477..5d5b86a 100644
--- a/intg-denonavr/avr.py
+++ b/intg-denonavr/avr.py
@@ -46,6 +46,8 @@
 
 DISCOVERY_AFTER_CONNECTION_ERRORS = 10
 
+AVR_COMMAND_URL = "/goform/formiPhoneAppDirect.xml"
+
 
 class Events(IntEnum):
     """Internal driver events."""
@@ -716,6 +718,107 @@ async def select_sound_mode(self, sound_mode: str | None) -> ucapi.StatusCodes:
             return ucapi.StatusCodes.BAD_REQUEST
         await self._receiver.async_set_sound_mode(sound_mode)
 
+    @async_handle_denonlib_errors
+    async def cursor_up(self) -> ucapi.StatusCodes:
+        """Send cursor up command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNCUP")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNCUP")
+
+    @async_handle_denonlib_errors
+    async def cursor_down(self) -> ucapi.StatusCodes:
+        """Send cursor down command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNCDN")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNCDN")
+
+    @async_handle_denonlib_errors
+    async def cursor_left(self) -> ucapi.StatusCodes:
+        """Send cursor left command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNCLT")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNCLT")
+
+    @async_handle_denonlib_errors
+    async def cursor_right(self) -> ucapi.StatusCodes:
+        """Send cursor right command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNCRT")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNCRT")
+
+    @async_handle_denonlib_errors
+    async def cursor_enter(self) -> ucapi.StatusCodes:
+        """Send cursor enter command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNENT")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNENT")
+
+    @async_handle_denonlib_errors
+    async def info(self) -> ucapi.StatusCodes:
+        """Send info OSD command command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNINF")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNINF")
+
+    @async_handle_denonlib_errors
+    async def options(self) -> ucapi.StatusCodes:
+        """Send options menu command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNOPT")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNOPT")
+
+    @async_handle_denonlib_errors
+    async def back(self) -> ucapi.StatusCodes:
+        """Send back command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNRTN")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNRTN")
+
+    @async_handle_denonlib_errors
+    async def setup_open(self) -> ucapi.StatusCodes:
+        """Send open setup menu command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNMEN ON")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNMEN%20ON")
+
+    @async_handle_denonlib_errors
+    async def setup_close(self) -> ucapi.StatusCodes:
+        """Send close menu command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        if self._use_telnet:
+            await self._receiver.async_send_telnet_commands("MNMEN OFF")
+        else:
+            await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNMEN%20OFF")
+
+    @async_handle_denonlib_errors
+    async def setup(self) -> ucapi.StatusCodes:
+        """Send toggle open/close menu command to AVR."""
+        # TODO : to be updated when PR will be released https://github.com/ol-iver/denonavr/pull/290
+        # Using http get as the telnet commands won't return any values
+        res = await self._receiver.async_get_command(AVR_COMMAND_URL + "?MNMEN?")
+        if res is not None and res == "MNMEN ON":
+            await self.setup_close()
+        else:
+            await self.setup_open()
+
     def _increase_expected_volume(self):
         """Without telnet, increase expected volume and send update event."""
         if not self._use_telnet or self._expected_volume is None:
diff --git a/intg-denonavr/media_player.py b/intg-denonavr/media_player.py
index e783c5d..683770e 100644
--- a/intg-denonavr/media_player.py
+++ b/intg-denonavr/media_player.py
@@ -48,6 +48,10 @@ def __init__(self, device: AvrDevice, receiver: avr.DenonDevice):
             Features.MEDIA_IMAGE_URL,
             Features.MEDIA_TYPE,
             Features.SELECT_SOURCE,
+            Features.DPAD,
+            Features.MENU,
+            Features.CONTEXT_MENU,
+            Features.INFO,
         ]
         attributes = {
             Attributes.STATE: States.UNAVAILABLE,
@@ -112,6 +116,24 @@ async def command(self, cmd_id: str, params: dict[str, Any] | None = None) -> St
             res = await self._receiver.select_source(params.get("source"))
         elif cmd_id == Commands.SELECT_SOUND_MODE:
             res = await self._receiver.select_sound_mode(params.get("mode"))
+        elif cmd_id == Commands.CURSOR_UP:
+            res = await self._receiver.cursor_up()
+        elif cmd_id == Commands.CURSOR_DOWN:
+            res = await self._receiver.cursor_down()
+        elif cmd_id == Commands.CURSOR_LEFT:
+            res = await self._receiver.cursor_left()
+        elif cmd_id == Commands.CURSOR_RIGHT:
+            res = await self._receiver.cursor_right()
+        elif cmd_id == Commands.CURSOR_ENTER:
+            res = await self._receiver.cursor_enter()
+        elif cmd_id == Commands.BACK:
+            res = await self._receiver.back()
+        elif cmd_id == Commands.MENU:
+            res = await self._receiver.setup()
+        elif cmd_id == Commands.CONTEXT_MENU:
+            res = await self._receiver.options()
+        elif cmd_id == Commands.INFO:
+            res = await self._receiver.info()
         else:
             return StatusCodes.NOT_IMPLEMENTED
 
diff --git a/requirements.txt b/requirements.txt
index d315c41..5388b78 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 pyee>=9.0
-denonavr~=0.11.4
-ucapi==0.1.3
+denonavr~=0.11.6
+ucapi==0.1.7