Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger

[iron-blogger] / render.py

diff --git a/render.py b/render.py
index 6e4e80ce53e708b007b00f656a9526ebda1333d2..9e1fbdc48b422609ebd4c574decf5fecd046a7ce 100755 (executable)
--- a/render.py
+++ b/render.py
@@ -20,10 +20,8 @@ def get_balance(acct):
     return float(out.split()[0][1:])
 
 def get_debts():
-    p = subprocess.Popen(['ledger', '-f',
-                           os.path.join(HERE, 'ledger'),
-                           '--no-color', '--flat',
-                           '--no-total', 'balance', 'Pool:Owed:'],
+    p = subprocess.Popen(['ledger', '-f', os.path.join(HERE, 'ledger'),
+                          '-n', 'balance', 'Pool:Owed:'],
                          stdout=subprocess.PIPE)
     (out, _) = p.communicate()
     debts = []
@@ -75,6 +73,7 @@ def render_template(path, week=None, **kwargs):
     lame = []
     skip = []
     userlist = []
+    punted = []
 
     class User(object):
         pass
@@ -90,10 +89,15 @@ def render_template(path, week=None, **kwargs):
 
         userlist.append(u)
 
+        # create a subset of punted users
+        if u.end:
+            punted.append(u)
+
     def user_key(u):
         return (u.start, u.username)
 
     userlist.sort(key=user_key)
+    punted.sort(key=user_key)
 
     for u in userlist:
         user_start = parse(u.start, default=START)
@@ -115,7 +119,7 @@ def render_template(path, week=None, **kwargs):
         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, **kwargs)
+        debts=debts, punted=punted, **kwargs)
 
 if __name__ == '__main__':
     if len(sys.argv) < 2: