Remove afarrell and kyoki as punting.

diff --git a/bloggers.yml b/bloggers.yml
index f908c1b8961c6684719cae271358733acdf3830d..db0c20660f483646443cd11cad954632f728e4e8 100644 (file)
--- a/bloggers.yml
+++ b/bloggers.yml
@@ -6,6 +6,7 @@ afarrell:
   links:
   - ['10,000 Hours', 'http://afarrell.scripts.mit.edu/blog/', 'http://afarrell.scripts.mit.edu/blog/?feed=rss2']
   start: 12/28
   links:
   - ['10,000 Hours', 'http://afarrell.scripts.mit.edu/blog/', 'http://afarrell.scripts.mit.edu/blog/?feed=rss2']
   start: 12/28

+  end: 02/01/2010

 broder:
   links:
   - ["\u03B8: The nerd's angle", 'http://ebroder.net/', 'http://ebroder.net/feed/atom/']
 broder:
   links:
   - ["\u03B8: The nerd's angle", 'http://ebroder.net/', 'http://ebroder.net/feed/atom/']


@@ -90,6 +91,7 @@ kyoki:
   links:
   - [The World's a Stage, 'http://kyoki.scripts.mit.edu/blog/', 'http://kyoki.scripts.mit.edu/blog/?feed=rss2']
   start: 12/28
   links:
   - [The World's a Stage, 'http://kyoki.scripts.mit.edu/blog/', 'http://kyoki.scripts.mit.edu/blog/?feed=rss2']
   start: 12/28

+  end: 02/01/2010

 laura47:
   links:
   - [LAURA, 'http://lauraboylan.blogspot.com/', 'http://lauraboylan.blogspot.com/feeds/posts/default']
 laura47:
   links:
   - [LAURA, 'http://lauraboylan.blogspot.com/', 'http://lauraboylan.blogspot.com/feeds/posts/default']

diff --git a/render.py b/render.py
index 478c44cd3af3b590121d46d404ee430ed1197194..dc4ad3d560cd36767802a7b4d3fd346d4d594531 100755 (executable)
--- a/render.py
+++ b/render.py
@@ -40,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)


@@ -51,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]: