From 4abdee1dc1891ad212a48040d89ebc5b9dcc6088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Oliva?= Date: Sun, 7 May 2023 17:56:57 -0600 Subject: Balance now has colors! Moved color functions to its own file. Now the colored output can be easily edited in general. --- utils/balance.py | 9 +++++---- utils/colored_output.py | 21 +++++++++++++++++++++ utils/register.py | 17 +---------------- 3 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 utils/colored_output.py (limited to 'utils') diff --git a/utils/balance.py b/utils/balance.py index 64fa3e3..c13dee8 100644 --- a/utils/balance.py +++ b/utils/balance.py @@ -2,6 +2,7 @@ from typing import List from utils.read_file import entry from utils.register import currencies, complete_prices +from utils.colored_output import * class tree: @@ -53,18 +54,18 @@ class tree: result = '' if not ignore_level: for price in self.value: - result += f'{price:>20}\n' + result += price_f(f'{price:>20}') + '\n' result = result.rstrip() result += ' ' + ' '*(2 * level) if len(self.children) == 1: - result += self.name + ':' + result += account_f(self.name + ':') for child in self.children: result += child.__str__(level + 1, ignore_level = True) else: - result += self.name + '\n' + result += account_f(self.name) + '\n' for child in self.children: result += child.__str__(level + 1) @@ -96,7 +97,7 @@ class accounts_tree: result += '--------------------\n' for price in self.my_accounts.value: - result += f'{price:>20}\n' + result += price_f(f'{price:>20}') + '\n' return result.rstrip() diff --git a/utils/colored_output.py b/utils/colored_output.py new file mode 100644 index 0000000..e44c39d --- /dev/null +++ b/utils/colored_output.py @@ -0,0 +1,21 @@ +import colorama + + +def date_f(text: str) -> str: + """Format of the date.""" + return text + +def comment_f(text: str) -> str: + """Format of the transaction's comment.""" + return colorama.Style.BRIGHT + text + colorama.Style.RESET_ALL + +def account_f(text: str) -> str: + """Format of the account's name.""" + return colorama.Fore.BLUE + text + colorama.Style.RESET_ALL + +def price_f(text: str) -> str: + """Format of the price.""" + if '-' in text: + return colorama.Fore.RED + text + colorama.Style.RESET_ALL + else: + return text diff --git a/utils/register.py b/utils/register.py index b067e56..5fdbf06 100644 --- a/utils/register.py +++ b/utils/register.py @@ -1,24 +1,9 @@ from utils.read_file import entry +from utils.colored_output import * from typing import List, Iterator import re import shutil -import colorama - -def date_f(text: str): - return text - -def comment_f(text: str): - return colorama.Style.BRIGHT + text + colorama.Style.RESET_ALL - -def account_f(text: str): - return colorama.Fore.BLUE + text + colorama.Style.RESET_ALL - -def price_f(text: str): - if '-' in text: - return colorama.Fore.RED + text + colorama.Style.RESET_ALL - else: - return text class currencies: -- cgit v1.2.3