From 7f140371b61be62e192d8fa9af0366e96db2be2e Mon Sep 17 00:00:00 2001
From: Davte <davte@libero.it>
Date: Mon, 18 May 2020 19:31:26 +0200
Subject: [PATCH] Prettify expressions

---
 davtelepot/__init__.py     |  2 +-
 davtelepot/useful_tools.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/davtelepot/__init__.py b/davtelepot/__init__.py
index 84cf5f0..c75d6c4 100644
--- a/davtelepot/__init__.py
+++ b/davtelepot/__init__.py
@@ -11,7 +11,7 @@ __author__ = "Davide Testa"
 __email__ = "davide@davte.it"
 __credits__ = ["Marco Origlia", "Nick Lee @Nickoala"]
 __license__ = "GNU General Public License v3.0"
-__version__ = "2.5.18"
+__version__ = "2.5.19"
 __maintainer__ = "Davide Testa"
 __contact__ = "t.me/davte"
 
diff --git a/davtelepot/useful_tools.py b/davtelepot/useful_tools.py
index 1e4c032..80fdf7c 100644
--- a/davtelepot/useful_tools.py
+++ b/davtelepot/useful_tools.py
@@ -7,6 +7,7 @@ import datetime
 import json
 import logging
 import operator
+import re
 
 from collections import OrderedDict
 from typing import List, Union
@@ -182,6 +183,16 @@ def get_operators() -> dict:
 
 calc_buttons = get_calc_buttons()
 operators = get_operators()
+operators_spacer = re.compile(r"(\d)\s*([+\-*%]|/{1,2})\s*(\d)")
+spaced_operators = r"\1 \2 \3"
+operators_space_remover = re.compile(r"(\d)\s*(\*\*)\s*(\d)")
+un_spaced_operators = r"\1\2\3"
+
+
+def prettify_expression(expression):
+    expression = operators_spacer.sub(spaced_operators, expression)
+    expression = operators_space_remover.sub(un_spaced_operators, expression)
+    return expression
 
 
 def get_calculator_keyboard(additional_data: list = None):
@@ -367,6 +378,7 @@ async def calculate_session(bot: Bot,
             expression += calc_buttons[input_value]['value']
         else:
             logging.error(f"Invalid input from calculator button: {input_value}")
+    expression = prettify_expression(expression)
     if record:
         bot.db['calculations'].update(
             dict(
@@ -449,6 +461,7 @@ async def _calculate_command(bot: Bot,
                 id=record_id
             )
             expression = f"{record['expression'] or ''}\n{text}"
+        expression = prettify_expression(expression)
         bot.db['calculations'].update(
             dict(
                 id=record_id,