From c23be0f78d4003c860967d379540e2f463992b75 Mon Sep 17 00:00:00 2001 From: Evgeny Zinoviev Date: Sun, 23 May 2021 00:10:56 +0300 Subject: prettify output for gs, ri and errs requests --- inverter-bot | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'inverter-bot') diff --git a/inverter-bot b/inverter-bot index edae9a5..6f8c40b 100755 --- a/inverter-bot +++ b/inverter-bot @@ -90,6 +90,13 @@ def handle_exc(update: Update, e) -> None: elif not isinstance(e, TimedOut): reply(update, 'exception: ' + str(e)) + +def beautify_table(s): + lines = s.split('\n') + lines = list(map(lambda line: re.sub(r'\s+', ' ', line), lines)) + lines = list(map(lambda line: re.sub(r'(.*?): (.*)', r'\1: \2', line), lines)) + return '\n'.join(lines) + # # command/message handlers # @@ -176,7 +183,7 @@ def msg_generation(update: Update, context: CallbackContext) -> None: def msg_gs(update: Update, context: CallbackContext) -> None: try: status = inverter.exec('get-status', format=Format.TABLE) - reply(update, status) + reply(update, beautify_table(status)) except Exception as e: handle_exc(update, e) @@ -184,7 +191,7 @@ def msg_gs(update: Update, context: CallbackContext) -> None: def msg_ri(update: Update, context: CallbackContext) -> None: try: rated = inverter.exec('get-rated', format=Format.TABLE) - reply(update, rated) + reply(update, beautify_table(rated)) except Exception as e: handle_exc(update, e) @@ -192,7 +199,7 @@ def msg_ri(update: Update, context: CallbackContext) -> None: def msg_errors(update: Update, context: CallbackContext) -> None: try: errors = inverter.exec('get-errors', format=Format.TABLE) - reply(update, errors) + reply(update, beautify_table(errors)) except Exception as e: handle_exc(update, e) -- cgit v1.2.3