From 6368b11ebf82d455c978afaa4aa140c647538618 Mon Sep 17 00:00:00 2001
From: Morg42 <43153739+Morg42@users.noreply.github.com>
Date: Mon, 24 Jul 2023 12:21:42 +0200
Subject: [PATCH] added standby mode, do_before_send

---
 kodi/__init__.py | 47 ++++++++++++++++++-----------------------------
 kodi/plugin.yaml | 10 +++++++++-
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/kodi/__init__.py b/kodi/__init__.py
index b3f6ba87d..533ad064a 100644
--- a/kodi/__init__.py
+++ b/kodi/__init__.py
@@ -81,7 +81,7 @@ class kodi(SmartDevicePlugin):
           another place, in ``commands.py`` and/or the item configuration.
     """
 
-    PLUGIN_VERSION = '1.7.0'
+    PLUGIN_VERSION = '1.7.1'
 
     def _set_device_defaults(self):
         self._use_callbacks = True
@@ -111,6 +111,10 @@ def on_data_received(self, by, data, command=None):
         :param data: received data in 'raw' connection format
         :type command: str
         """
+        if self.standby:
+            self.logger.debug(f'received data for command {command} on standby, discarding data.')
+            return
+
         if command is not None:
             self.logger.debug(f'received data "{data}" for command {command}')
         else:
@@ -321,45 +325,26 @@ def on_data_received(self, by, data, command=None):
         self.logger.debug(f'received data "{data}" for command {command} converted to value {value}')
         self._dispatch_callback(command, value, by)
 
-    def send_command(self, command, value=None, **kwargs):
+    def _do_before_send(self, command, value, kwargs):
         """
-        Checks for special commands and handles them, otherwise call the
-        base class' method
-
-        :param command: the command to send
-        :param value: the data to send, if applicable
-        :type command: str
-        :return: True if send was successful, False otherwise
-        :rtype: bool
+        Checks for special commands and handles them
         """
-        if not self.alive:
-            self.logger.warning(f'trying to send command {command} with value {value}, but device is not active.')
-            return False
-
-        if not self._connection:
-            self.logger.warning(f'trying to send command {command} with value {value}, but connection is None. This shouldn\'t happen...')
-            return False
-
-        if not self._connection.connected:
-            self._connection.open()
-            if not self._connection.connected:
-                self.logger.warning(f'trying to send command {command} with value {value}, but connection could not be established.')
-                return False
-
         if command in self._special_commands['read' if value is None else 'write']:
             if command == 'status.update':
                 if value:
                     self._update_status()
-                return True
+                return (False, True)
             elif value is None:
                 self.logger.debug(f'Special command {command} called for reading, which is not intended. Ignoring request')
-                return True
+                return (False, True)
             else:
                 # this shouldn't happen
                 self.logger.warning(f'Special command {command} found, no action set for processing. Please inform developers. Ignoring request')
-                return True
-        else:
-            return super().send_command(command, value, playerid=self._playerid, **kwargs)
+                return (False, True)
+
+        # add playerid to kwargs for further processing
+        kwargs['playerid'] = self._playerid
+        return (True, True)
 
     def is_valid_command(self, command, read=None):
         """
@@ -395,6 +380,10 @@ def notify(self, title, message, image=None, display_time=10000):
         :param image: an optional image to be displayed alongside the message
         :param display_time: how long the message is displayed in milli seconds
         """
+        if self.standby:
+            self.logger.info(f'trying to send notification {title}, but plugin is in standby mode. Discarding notification.')
+            return
+
         params = {'title': title, 'message': message, 'displaytime': display_time}
         if image is not None:
             params['image'] = image
diff --git a/kodi/plugin.yaml b/kodi/plugin.yaml
index 14f09ac1e..8fa4da0eb 100644
--- a/kodi/plugin.yaml
+++ b/kodi/plugin.yaml
@@ -6,7 +6,7 @@ plugin:
     tester: OnkelAndy
     state: develop
     keywords: iot device mediacenter kodi xmbc sdp
-    version: 1.7.0
+    version: 1.7.1
     sh_minversion: 1.9.5
     py_minversion: 3.7
     multi_instance: false
@@ -23,6 +23,14 @@ parameters:
             de: Netzwerkziel/-host
             en: network host
 
+    standby_item_path:
+        type: str
+        default: ''
+
+        description:
+            de: 'Item-Pfad für das Standby-Item'
+            en: 'item path for standby switch item'
+
     timeout:
         type: num
         default: 3