moved the bloggers.yml and ledger over to the new format

[iron-blogger] / render.py

diff --git a/render.py b/render.py
index cacd90da6360c8fe2b799eb21f4f81b05d6ce826..58a1fc4371ed83333df3577138c387f1786439d7 100755 (executable)
--- a/render.py
+++ b/render.py
@@ -7,21 +7,22 @@ import sys
 import os
 import os.path
 import subprocess
 import os
 import os.path
 import subprocess

+import re

 from mako.template import Template
 
 from mako.template import Template
 

-START = datetime.datetime(2009, 12, 21, 6)
-HERE  = os.path.dirname(__file__)
+from config import *

 
 def get_balance(acct):
 
 def get_balance(acct):

-    p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'),
-                          '-n', 'balance', acct],
+    print acct
+    balance_cmd_tmp = BALANCE_CMD
+    balance_cmd_tmp.append(acct)
+    p = subprocess.Popen(balance_cmd_tmp,

                          stdout=subprocess.PIPE)
     (out, _) = p.communicate()
                          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():
 
 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 = []
                          stdout=subprocess.PIPE)
     (out, _) = p.communicate()
     debts = []


@@ -29,10 +30,31 @@ def get_debts():
         if not line: continue
         (val, acct) = line.split()
         user = acct[len("Pool:Owed:"):]
         if not line: continue
         (val, acct) = line.split()
         user = acct[len("Pool:Owed:"):]

-        val  = float(val[len("$"):])
+        val = float(re.sub(r'(\D)?(\d+)$', r'\2', val))

         debts.append((user, val))
     return debts
 
         debts.append((user, val))
     return debts
 

+def to_week_num(date):
+    return (parse(date, default=START) - START).days / 7
+
+def parse_skip(rec):
+    spec = rec.get('skip', [])
+    out = []
+    for s in spec:
+        if isinstance(s, list):
+            out.append(map(to_week_num, s))
+        else:
+            out.append(to_week_num(s))
+    return out
+
+def should_skip(skips, week):
+    for e in skips:
+        if e == week:
+            return True
+        if isinstance(e, list) and e[0] <= week and e[1] > week:
+            return True
+    return False
+

 def render_template(path, week=None, **kwargs):
     with open('out/report.yml') as r:
         report = yaml.safe_load(r)
 def render_template(path, week=None, **kwargs):
     with open('out/report.yml') as r:
         report = yaml.safe_load(r)


@@ -52,6 +74,7 @@ def render_template(path, week=None, **kwargs):
     lame = []
     skip = []
     userlist = []
     lame = []
     skip = []
     userlist = []

+    punted = []

 
     class User(object):
         pass
 
     class User(object):
         pass


@@ -62,23 +85,27 @@ def render_template(path, week=None, **kwargs):
         u.links = rec['links']
         u.start = rec['start']
         u.end   = rec.get('end')
         u.links = rec['links']
         u.start = rec['start']
         u.end   = rec.get('end')

-        u.skip  = [(parse(x, default=START) - START).days / 7
-                   for x in rec.get('skip', [])]
+        u.skip  = parse_skip(rec)

         u.weeks = report.get(un, [])
 
         userlist.append(u)
 
         u.weeks = report.get(un, [])
 
         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)
     def user_key(u):
         return (u.start, u.username)
 
     userlist.sort(key=user_key)

+    punted.sort(key=user_key)

 
     for u in userlist:
 
     for u in userlist:

-        user_start = parse(u.start, default=START)
+        user_start = datetime.datetime(*(u.start.timetuple()[:6]))

         if u.end and parse(u.end, default=START) <= week_start:
             continue
         if u.end and parse(u.end, default=START) <= week_start:
             continue

-
-        if week in u.skip:
+        
+        if should_skip(u.skip, week):

             pass
         elif user_start > week_start:
             skip.append(u)
             pass
         elif user_start > week_start:
             skip.append(u)


@@ -89,11 +116,14 @@ def render_template(path, week=None, **kwargs):
 
     debts = get_debts()
 
 
     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'),
         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, currency=CURRENCY, fine=FINE_SIZE,
+        **kwargs)

 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
 
 if __name__ == '__main__':
     if len(sys.argv) < 2: