@@ -8,18 +8,7 @@ import time

 import argparse

 from prettytable import PrettyTable

 from termcolor import colored

-

-UNUSUAL_BALANCE_THRESHOLD  = 500.0

-WORRYING_BALANCE_THRESHOLD = 100.0

-HOLYSHIT_BALANCE_THRESHOLD = 0

-MAX_AGE = 24 * 60 * 60

-

-CURRENCIES = {

-    'EUR': '€',

-    'USD': '$',

-    'GBP': '£',

-    'YEN': '¥'

-}

+from boobank_utils import *

 def parse_args():

     args_parser = argparse.ArgumentParser(description='Display the contents of cached "boobank list" JSON files.')

@@ -41,7 +30,7 @@ def main():

     print(table)

     total_line = '%-60s' % ''

     total_line += colored('Total: ', 'white', attrs=['bold'])

-    total_line += format_balance({'balance': total})

+    total_line += format_amount(total, DEFAULT_CURRENCY, COLORING_THRESHOLD)

     print(total_line)

 def get_accounts(accounts_json_path):

@@ -63,34 +52,10 @@ def get_table():

 def add_account(table, account, cache_timestamp):

     id = colored(account.get('id'), 'cyan')

     label = colored(account.get('label'), 'cyan')

-    balance = format_balance(account)

+    currency = account.get('currency', DEFAULT_CURRENCY)

+    balance = format_amount(account['balance'], currency, COLORING_THRESHOLD)

     cache_date = format_timestamp_colored(cache_timestamp, MAX_AGE)

     table.add_row([id, label, balance, cache_date])

-def format_balance(account):

-    balance = account.get('balance')

-    currency = account.get('currency', 'EUR')

-    balance_format = '%12.2f '

-    balance_format += CURRENCIES.get(currency, currency)

-

-    balance_color = 'green'

-    balance_attr = []

-    if balance < HOLYSHIT_BALANCE_THRESHOLD:

-        balance_color = 'red'

-        balance_attr = ['blink']

-    elif balance < WORRYING_BALANCE_THRESHOLD:

-        balance_color = 'red'

-    elif balance < UNUSUAL_BALANCE_THRESHOLD:

-        balance_color = 'yellow'

-    return colored(balance_format % balance, balance_color, attrs=balance_attr)

-

-def format_timestamp_colored(timestamp, max_age):

-    result = format_timestamp(timestamp)

-    color = 'red' if timestamp + max_age < time.time() else 'green'

-    return colored(result, color)

-

-def format_timestamp(timestamp):

-    return time.strftime('%A %Y-%m-%d %H:%M:%S %Z', time.localtime(timestamp))

-

 if __name__ == '__main__':

     main()

@@ -10,23 +10,13 @@ import time

 import errno

 import argparse

 import subprocess

-

-DEFAULT_CONF_FILE = '~/.config/boobank-cacher/conf.json'

+from boobank_utils import *

 def get_conf(conf_path):

     conf_path = os.path.expanduser(conf_path)

     with open(conf_path, 'r') as filedesc:

         return json.load(filedesc)

-def mkdir(path, mode):

-    try:

-        os.makedirs(path, mode)

-    except OSError as exc:

-        if exc.errno == errno.EEXIST and os.path.isdir(path):

-            pass

-        else:

-            raise

-

 def run_boobank(conf):

     results = copy.deepcopy(conf)

     # Ensure there is at least one command to run:

@@ -8,15 +8,7 @@ import time

 import argparse

 from prettytable import PrettyTable

 from termcolor import colored

-

-MAX_AGE = 24 * 60 * 60

-

-CURRENCIES = {

-    'EUR': '€',

-    'USD': '$',

-    'GBP': '£',

-    'YEN': '¥'

-}

+from boobank_utils import *

 def parse_args():

     args_parser = argparse.ArgumentParser(description='Display the contents of a cached "boobank history" JSON file.')

@@ -60,26 +52,9 @@ def get_table(timestamp):

 def add_operation(table, operation):

     date = colored(operation.get('date'), 'cyan')

     label = colored(operation.get('label')[:80], 'cyan')

-    amount = format_amount(operation)

+    currency = operation.get('currency', DEFAULT_CURRENCY)

+    amount = format_amount(operation['amount'], currency, COLORING_SIMPLE)

     table.add_row([date, label, amount])

-def format_amount(account):

-    amount = account.get('amount')

-    currency = account.get('currency', 'EUR')

-    amount_format = '%12.2f '

-    amount_format += CURRENCIES.get(currency, currency)

-

-    amount_color = 'green' if amount >= 0 else 'red'

-    amount_attr = []

-    return colored(amount_format % amount, amount_color, attrs=amount_attr)

-

-def format_timestamp_colored(timestamp, max_age):

-    result = format_timestamp(timestamp)

-    color = 'red' if timestamp + max_age < time.time() else 'green'

-    return colored(result, color)

-

-def format_timestamp(timestamp):

-    return time.strftime('%A %Y-%m-%d %H:%M:%S %Z', time.localtime(timestamp))

-

 if __name__ == '__main__':

     main()

new file mode 100644

@@ -0,0 +1,84 @@

+# -*- coding: utf-8 -*-

+"""

+This module provides various functions and constants used by the boobank-utils

+tools.

+"""

+import os

+import time

+import errno

+from termcolor import colored

+

+DEFAULT_CONF_FILE = '~/.config/boobank-cacher/conf.json'

+MAX_AGE = 24 * 60 * 60

+

+UNUSUAL_THRESHOLD = 500.0

+WORRYING_THRESHOLD = 100.0

+HOLYSHIT_THRESHOLD = 0

+

+CURRENCIES = {

+    'EUR': '€',

+    'USD': '$',

+    'GBP': '£',

+    'YEN': '¥'

+}

+DEFAULT_CURRENCY = 'EUR'

+

+COLORING_NONE = 0

+COLORING_SIMPLE = 1

+COLORING_THRESHOLD = 2

+COLORING_MAX = 3

+

+def format_timestamp_colored(timestamp, max_age):

+    """

+    Format the given Unix timestamp for puny humans.

+    Additionally, the timestamp is colored: red if older than max_age, false

+    otherwise. This is useful to show whether cached data are obsolete.

+    """

+    result = format_timestamp(timestamp)

+    color = 'red' if timestamp + max_age < time.time() else 'green'

+    return colored(result, color)

+

+def format_timestamp(timestamp):

+    """

+    Format the given Unix timestamp for puny humans.

+    """

+    return time.strftime('%A %Y-%m-%d %H:%M:%S %Z', time.localtime(timestamp))

+

+def format_amount(amount, currency=DEFAULT_CURRENCY, coloring=None):

+    """

+    Format the given amount and currency into an optionally colored string.

+    """

+    amount_format = '%12.2f ' + CURRENCIES.get(currency, currency)

+    result = amount_format % amount

+

+    if coloring < COLORING_SIMPLE or coloring >= COLORING_MAX:

+        return result

+

+    amount_color = 'green'

+    amount_attr = []

+    if coloring == COLORING_SIMPLE:

+        if amount < 0:

+            amount_color = 'red'

+    else:

+        # Assume COLORING_THRESHOLD:

+        if amount < HOLYSHIT_THRESHOLD:

+            amount_color = 'red'

+            amount_attr = ['blink']

+        elif amount < WORRYING_THRESHOLD:

+            amount_color = 'red'

+        elif amount < UNUSUAL_THRESHOLD:

+            amount_color = 'yellow'

+    return colored(result, amount_color, attrs=amount_attr)

+

+def mkdir(path, mode):

+    """

+    Create a directory along with all missing parents.

+    All created directories get assigned the given Unix mode.

+    """

+    try:

+        os.makedirs(path, mode)

+    except OSError as exc:

+        if exc.errno == errno.EEXIST and os.path.isdir(path):

+            pass

+        else:

+            raise