cover-control.py: Use different commands for window control

Author: oheim

cover-control.py

@@ -181,19 +181,16 @@ async def apply_schedule():
         logging.exception('Fehler beim Anwenden des Plans')
 
 
-async def open_window(args):
+async def on_window_command(command, args):
     global window_is_closed
 
-    if len(args) != 1:
-        return
-
-    if args[0] == 'auf':
+    if command == 'fenster_auf':
         logging.info('Fenster werden geöffnet')
         arduinoclient.open_window()
         window_is_closed = False
         await telegram.bot_send(text='Die Fenster werden geöffnet')
 
-    if args[0] == 'zu':
+    if command == 'fenster_zu':
         logging.info('Fenster werden geschlossen')
         arduinoclient.close_window()
         window_is_closed = True
@@ -208,7 +205,7 @@ async def main():
 
     mqttclient.connect(server=config['MQTT_SERVER'], user=config['MQTT_USER'], password=config['MQTT_PASSWORD'], topic=config['MQTT_TOPIC'])
 
-    await telegram.bot_start(token=config['TELEGRAM_BOT_TOKEN'], chat_id=config['TELEGRAM_CHAT_ID'], command='Fenster', command_callback=open_window)
+    await telegram.bot_start(token=config['TELEGRAM_BOT_TOKEN'], chat_id=config['TELEGRAM_CHAT_ID'], commands=['fenster_auf', 'fenster_zu'], command_callback=on_window_command)
 
     update_schedule()
 

modules/telegram.py

@@ -27,49 +27,46 @@
 
 application = None
 default_chat_id = None
-custom_command = None
-custom_command_callback = None
 
-async def bot_start(token, chat_id, command = None, command_callback = None):
+class MyCommandHandler(telegram.ext.CommandHandler):
+    __slots__ = ('my_command', 'my_callback')
+
+    def __init__(self, command, callback):
+        super().__init__(command, self.on_command)
+        self.my_command = command
+        self.my_callback = callback
+
+    async def on_command(self, update, context: telegram.ext.ContextTypes.DEFAULT_TYPE):
+        try:
+            if self.my_command is not None:
+                await self.my_callback(self.my_command, context.args)
+        except:
+            logging.exception('Fehler beim Bearbeiten des Kommandos')
+
+
+async def bot_start(token, chat_id, commands = [ ], command_callback = None):
     global application
     global default_chat_id
-    global custom_command
-    global custom_command_callback
 
     default_chat_id = chat_id
-    
+
     application = telegram.ext.Application.builder().token(token).read_timeout(20).get_updates_read_timeout(30).build()
 
     application.add_error_handler(on_error)
 
-    if command is not None:
-        application.add_handler(telegram.ext.CommandHandler(command, on_custom_command))
-        
-    custom_command = command
-    custom_command_callback = command_callback
-    
+    for command in commands:
+        application.add_handler(MyCommandHandler(command, command_callback))
+
     await application.initialize()
     await application.updater.start_polling()
     await application.start()
 
 
-async def on_custom_command(update, context: telegram.ext.ContextTypes.DEFAULT_TYPE):
-    global custom_command_callback
-    
-    try:
-        if custom_command_callback is not None:
-            await custom_command_callback(context.args)
-
-    except:
-        logging.exception('Fehler beim Bearbeiten des Kommandos')
-
-
 async def on_error(update, context: telegram.ext.ContextTypes.DEFAULT_TYPE):
     global application
-    global custom_command
-    
+
     logging.exception('Error in telegram bot', exc_info = context.error)
-    
+
     # If the bot is idle for several hours it might happen that it looses
     # connection after a NetworkError.  We can fix that with a simple reconnect
     if isinstance(context.error, telegram.error.NetworkError):
@@ -88,20 +85,20 @@ async def bot_stop():
 async def bot_send(text, chat_id = None):
     global application
     global default_chat_id
-    
+
     if chat_id is None:
         chat_id = default_chat_id
-        
+
     message = await application.bot.send_message(chat_id, text)
-    
+
     return message.message_id
 
 async def bot_delete(message_id, chat_id = None):
     global application
     global default_chat_id
-    
+
     if chat_id is None:
         chat_id = default_chat_id
-        
+
     await application.bot.delete_message(chat_id, message_id)
-    
+