Update for 2012-02-06

[iron-blogger] / render.py

diff --git a/render.py b/render.py
index f226adb906448fa945efda8ea05b7bd169f22073..feaa16b8906dd6f50bce20bf99ae7493a196d205 100755 (executable)
--- a/render.py
+++ b/render.py
@@ -9,7 +9,7 @@ import os.path
 import subprocess
 from mako.template import Template
 
 import subprocess
 from mako.template import Template
 

-START = datetime.datetime(2009, 12, 21, 6)
+START = datetime.datetime(2011, 10, 24, 6)

 HERE  = os.path.dirname(__file__)
 
 def get_balance(acct):
 HERE  = os.path.dirname(__file__)
 
 def get_balance(acct):


@@ -33,7 +33,28 @@ def get_debts():
         debts.append((user, val))
     return debts
 
         debts.append((user, val))
     return debts
 

-def render_template(path, week=None):
+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)
 
     with open('out/report.yml') as r:
         report = yaml.safe_load(r)
 


@@ -62,8 +83,7 @@ def render_template(path, week=None):
         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)


@@ -78,7 +98,7 @@ def render_template(path, week=None):
         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)


@@ -93,7 +113,7 @@ def render_template(path, week=None):
         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)
+        debts=debts, **kwargs)

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