From: Benjamin Mako Hill Date: Tue, 14 Aug 2012 05:47:01 +0000 (-0400) Subject: update the rest of the code to support the new config format X-Git-Url: https://projects.mako.cc/source/iron-blogger/commitdiff_plain/2c61e383ade53f4af779f2398dd8e71d00b70b8c update the rest of the code to support the new config format --- diff --git a/config.py b/config.py index d112ea5..fa3a133 100644 --- a/config.py +++ b/config.py @@ -17,7 +17,7 @@ FINE_SIZE = 5 CURRENCY = "$" # check the version of ledger to find out which commands to use -if subprocess.check_output(['ledger', '--version'])[7] == 3: +if subprocess.check_output(['ledger', '--version'])[7] == "3": BALANCE_CMD = ['ledger', '-f', os.path.join(HERE,'ledger'), '--no-color', '-n', 'balance'] diff --git a/render.py b/render.py index 58a1fc4..6d6415e 100755 --- a/render.py +++ b/render.py @@ -13,7 +13,6 @@ from mako.template import Template from config import * def get_balance(acct): - print acct balance_cmd_tmp = BALANCE_CMD balance_cmd_tmp.append(acct) p = subprocess.Popen(balance_cmd_tmp, @@ -30,6 +29,7 @@ def get_debts(): if not line: continue (val, acct) = line.split() user = acct[len("Pool:Owed:"):] + if not user: continue val = float(re.sub(r'(\D)?(\d+)$', r'\2', val)) debts.append((user, val)) return debts @@ -102,7 +102,7 @@ def render_template(path, week=None, **kwargs): for u in userlist: user_start = datetime.datetime(*(u.start.timetuple()[:6])) - if u.end and parse(u.end, default=START) <= week_start: + if u.end and datetime.datetime(*(u.end.timetuple()[:6])) <= week_start: continue if should_skip(u.skip, week): diff --git a/templates/ledger b/templates/ledger index 3478d8b..56d06e0 100644 --- a/templates/ledger +++ b/templates/ledger @@ -1,5 +1,5 @@ % for u in sorted(lame, key=lambda u:u.username): -${week_end.strftime("%F")} Week ${week} +${week_end.strftime("%F")} Fine Week ${week} User:${u.username} -${fine} Pool:Owed:${u.username} % endfor diff --git a/weekly-update.py b/weekly-update.py index 8b60e52..eddb2c1 100755 --- a/weekly-update.py +++ b/weekly-update.py @@ -32,7 +32,7 @@ punt = [] with open('ledger', 'a') as f: f.write("\n") for (user, debt) in debts: - if debt < (FINE_SIZE * 6): continue + if debt <= (FINE_SIZE * 6): continue punt.append(user) f.write("""\ %(date)s Punt