@@ -11,6 +11,7 @@ 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': '€',

@@ -20,26 +21,23 @@ CURRENCIES = {

 }

 def main():

-    accounts = get_accounts()

     table = get_table()

     total = 0

-    for account in accounts.get('data', []):

-        add_account(table, account)

-        total += account.get('balance')

+    timestamps = {}

+    filepaths = set(sys.argv[1:])

+    for filepath in filepaths:

+        accounts = get_accounts(filepath)

+        timestamp = accounts.get('timestamp', time.time())

+        for account in accounts.get('data', []):

+            add_account(table, account, timestamp)

+            total += account.get('balance')

     print(table)

-    timestamp = accounts.get('timestamp', time.time())

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

-    date_info = ' Data cached on %s' % humandate

-    last_line = '%-60s' % date_info

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

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

-    print(last_line)

+    total_line = '%-60s' % ''

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

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

+    print(total_line)

-def get_accounts():

-    try:

-        accounts_json_path = sys.argv[1]

-    except IndexError:

-        accounts_json_path = os.path.expanduser('~/.cache/boobank-cacher/cache.json')

+def get_accounts(accounts_json_path):

     if accounts_json_path == '-':

         return json.load(sys.stdin)

     else:

@@ -48,17 +46,19 @@ def get_accounts():

 def get_table():

     pt = PrettyTable()

-    pt.field_names = ['Account ID', 'Account name', 'Balance']

+    pt.field_names = ['Account ID', 'Account name', 'Balance', 'Data cached on']

     pt.field_names = [colored(x, 'white', attrs=['bold']) for x in pt.field_names]

     pt.align = 'r'

     pt.align[pt.field_names[1]] = 'l'

+    pt.align[pt.field_names[3]] = 'c'

     return pt

-def add_account(table, account):

+def add_account(table, account, cache_timestamp):

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

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

     balance = format_balance(account)

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

+    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')

@@ -77,5 +77,13 @@ def format_balance(account):

         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()