X-Git-Url: https://projects.mako.cc/source/iron-blogger/blobdiff_plain/f2984ef5a6c2c6f44c8657bbc82ad676e48e7657..c4e9d9015357309c01ff27544efd9bcdb0d76a16:/render.py?ds=sidebyside diff --git a/render.py b/render.py index 9e1fbdc..58cb92e 100755 --- a/render.py +++ b/render.py @@ -7,21 +7,19 @@ import sys import os import os.path import subprocess +import re from mako.template import Template -START = datetime.datetime(2011, 10, 24, 6) -HERE = os.path.dirname(__file__) +from config import * def get_balance(acct): - p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'), - '-n', 'balance', acct], + p = subprocess.Popen(BALANCE_CMD + [acct], stdout=subprocess.PIPE) (out, _) = p.communicate() - return float(out.split()[0][1:]) + return float(re.sub(r'\s*(\d+)\s+.*', r'\1', out)) def get_debts(): - p = subprocess.Popen(['ledger', '-f', os.path.join(HERE, 'ledger'), - '-n', 'balance', 'Pool:Owed:'], + p = subprocess.Popen(DEBTS_CMD, stdout=subprocess.PIPE) (out, _) = p.communicate() debts = [] @@ -29,7 +27,8 @@ def get_debts(): if not line: continue (val, acct) = line.split() user = acct[len("Pool:Owed:"):] - val = float(val[len("$"):]) + if not user: continue + val = float(re.sub(r'(\D)?(\d+)$', r'\2', val)) debts.append((user, val)) return debts @@ -100,10 +99,10 @@ def render_template(path, week=None, **kwargs): punted.sort(key=user_key) for u in userlist: - user_start = parse(u.start, default=START) - if u.end and parse(u.end, default=START) <= week_start: + user_start = datetime.datetime(*(u.start.timetuple()[:6])) + if u.end and datetime.datetime(*(u.end.timetuple()[:6])) <= week_start: continue - + if should_skip(u.skip, week): pass elif user_start > week_start: @@ -115,11 +114,14 @@ def render_template(path, week=None, **kwargs): debts = get_debts() - return Template(filename=path, output_encoding='utf-8').render( + return Template(filename=path, input_encoding='utf-8', + output_encoding='utf-8', + default_filters=['decode.utf8']).render( week=week, week_start=week_start,week_end=week_end, good=good, lame=lame, skip=skip, userlist=userlist, pool=get_balance('Pool'), paid=get_balance('Pool:Paid'), - debts=debts, punted=punted, **kwargs) + debts=debts, punted=punted, currency=CURRENCY, fine=FINE_SIZE, + **kwargs) if __name__ == '__main__': if len(sys.argv) < 2: