Add Adam Fletcher

[iron-blogger] / render.py

diff --git a/render.py b/render.py
index f8cdd7a93e54ef57de46a68278066fee4a8bb664..dc4ad3d560cd36767802a7b4d3fd346d4d594531 100755 (executable)
--- a/render.py
+++ b/render.py
@@ -5,9 +5,12 @@ import datetime
 import dateutil.tz as tz
 import sys
 import os
 import dateutil.tz as tz
 import sys
 import os

+import os.path
+import subprocess

 from mako.template import Template
 
 START = datetime.datetime(2009, 12, 21, 6)
 from mako.template import Template
 
 START = datetime.datetime(2009, 12, 21, 6)

+HERE  = os.path.dirname(__file__)

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


@@ -37,6 +40,7 @@ def render_template(path, week=None):
         u.username = un
         u.links = rec['links']
         u.start = rec['start']
         u.username = un
         u.links = rec['links']
         u.start = rec['start']

+        u.end   = rec.get('end')

         u.weeks = report.get(un, [])
 
         userlist.append(u)
         u.weeks = report.get(un, [])
 
         userlist.append(u)


@@ -48,6 +52,9 @@ def render_template(path, week=None):
 
     for u in userlist:
         user_start = parse(u.start, default=START)
 
     for u in userlist:
         user_start = parse(u.start, default=START)

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

         if user_start > week_start:
             skip.append(u)
         elif len(u.weeks) <= week or not u.weeks[week]:
         if user_start > week_start:
             skip.append(u)
         elif len(u.weeks) <= week or not u.weeks[week]:


@@ -55,9 +62,16 @@ def render_template(path, week=None):
         else:
             good.append(u)
 
         else:
             good.append(u)
 

+    p = subprocess.Popen(['ledger', '-f', os.path.join(HERE,'ledger'),
+                          '-n', 'balance', 'Pool'],
+                         stdout=subprocess.PIPE)
+    (out, _) = p.communicate()
+    pool = int(out.split()[0][1:])
+

     return Template(filename=path, output_encoding='utf-8').render(
         week=week, week_start=week_start,week_end=week_end,
     return Template(filename=path, output_encoding='utf-8').render(
         week=week, week_start=week_start,week_end=week_end,

-        good=good, lame=lame, skip=skip, userlist=userlist)
+        good=good, lame=lame, skip=skip, userlist=userlist,
+        pool=pool)

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