Generalize show-week slightly.

diff --git a/show-week.py b/show-week.py
index 0f8ab6950d42ca14e0b710a6e7f58a29e159bab3..d5c9e51798bd5a560d00dd205a5684dfc6dff572 100755 (executable)
--- a/show-week.py
+++ b/show-week.py
@@ -4,35 +4,62 @@ from dateutil.parser import parse
 import datetime
 import dateutil.tz as tz
 import sys
 import datetime
 import dateutil.tz as tz
 import sys

+import os

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

+if len(sys.argv) < 2:
+    print >>sys.stderr, "Usage: %s TEMPLATE [WEEK]" 
+    sys.exit(1)
+
+template = sys.argv[1]

 START = datetime.datetime(2009, 12, 21, 6)
 
 START = datetime.datetime(2009, 12, 21, 6)
 

+if len(sys.argv) == 3:
+    week = parse(sys.argv[2], default=START)
+else:
+    week = START
+

 with open('out/report.yml') as r:
     report = yaml.safe_load(r)
 
 with open('bloggers.yml') as f:
     users = yaml.safe_load(f)
 
 with open('out/report.yml') as r:
     report = yaml.safe_load(r)
 
 with open('bloggers.yml') as f:
     users = yaml.safe_load(f)
 

-week = (parse(sys.argv[1], default=START) - START).days / 7
+week = (week - START).days / 7

 week_start = START + (week * datetime.timedelta(7))
 week_end   = START + ((week + 1) * datetime.timedelta(7))
 
 good = []
 lame = []
 skip = []
 week_start = START + (week * datetime.timedelta(7))
 week_end   = START + ((week + 1) * datetime.timedelta(7))
 
 good = []
 lame = []
 skip = []

+userlist = []
+
+class User(object):
+    pass
+
+for (un, rec) in users.items():
+    u = User()
+    u.username = un
+    u.links = rec['links']
+    u.start = rec['start']
+    u.weeks = report.get(un, [])
+
+    userlist.append(u)
+
+def user_key(u):
+    return (u.start, u.username)

 
 

+userlist.sort(key=user_key)

 
 

-for (name, weeks) in report.items():
-    user_start = parse(users[name]['start'], default=START)
+for u in userlist:
+    user_start = parse(u.start, default=START)

     if user_start > week_start:
     if user_start > week_start:

-        skip.append(name)
-        continue
-    elif len(weeks) <= week or not weeks[week]:
-        lame.append(name)
+        skip.append(u)
+    elif len(u.weeks) <= week or not u.weeks[week]:
+        lame.append(u)

     else:
     else:

-        good.append(name)
+        good.append(u)

 
 

-print Template(filename=sys.argv[2], output_encoding='utf-8').render(
+print Template(filename=template, output_encoding='utf-8').render(

     week=week, week_start=week_start,week_end=week_end,
     week=week, week_start=week_start,week_end=week_end,

-    good=good, lame=lame, skip=skip, users=users, report=report)
+    good=good, lame=lame, skip=skip, userlist=userlist)

diff --git a/templates/email.txt b/templates/email.txt
index 741e373cebfcfeb9d17787feb7fd93d68fd5786b..16d7a577633f7465ff2a9ab1ae0370a1a89ff919 100644 (file)
--- a/templates/email.txt
+++ b/templates/email.txt
@@ -3,9 +3,8 @@ To: iron-blogger@mit.edu
 
 People who posted:
 % for u in sorted(good):
 
 People who posted:
 % for u in sorted(good):

-<% posts = report[u][week] %>\
- ${u}:
- % for p in posts:
+ ${u.username}:
+ % for p in u.weeks[week]:

  - ${p['url']}
  % endfor
 % endfor
  - ${p['url']}
  % endfor
 % endfor


@@ -13,12 +12,12 @@ People who posted:
 People who failed to post:
 <% cash = 0 %>\
 % for u in sorted(lame):
 People who failed to post:
 <% cash = 0 %>\
 % for u in sorted(lame):

- ${u}
+ ${u.username}

 % endfor
 
 People who have not yet started:
 % for u in sorted(skip):
 % endfor
 
 People who have not yet started:
 % for u in sorted(skip):

- ${u}
+ ${u.username}

 % endfor
 
 Beer pool:
 % endfor
 
 Beer pool: