Stuttgart modifications

bloggers.yml

@@ -1,11 +1,92 @@
-chaosblog:
+ChemieEmma:
   links:
-  - [Chaosblog, 'http://chaosblog.wordpress.com/', 'http://chaosblog.wordpress.com/feed']
+  - [dent in the world (Englisch), 'http://dentintheworld.com/', 'http://dentintheworld.com/feed/atom/']
-  name: Marcus S.
+  name: Paula Schramm
-  start: 2012/01/01
+  start: 2012/09/24
-username:
+HubertMayer:
   links:
-  - [Blogname 01,'http://blog-URL.tld/']
+  - [Hubert Mayer - was mich so alles bewegt, 'http://hubert-mayer.de/', 'http://hubert-mayer.de/feed/']
-  - [Blogname 02,'http://blog-URL02.tld/']
+  name: Hubert Mayer
-  name: Jon Doe
+  start: 2012/09/24
-  start: YYYY/MM/DD
+TabTwo:
+  links:
+  - [Nerd Residenz, 'http://nerd-residenz.tumblr.com/', 'http://nerd-residenz.tumblr.com/rss']
+  name: Ralph Mayer
+  start: 2012/09/24
+affiliteur:
+  links:
+  - [Affiliteur, 'http://www.affiliteur.com/', 'http://www.affiliteur.com/feed/atom']
+  name: Sascha Schilling
+  start: 2012/09/24
+cmsfunk:
+  links:
+  - [Stattmarketing, 'http://stattmarketing.wordpress.com', 'http://stattmarketing.wordpress.com/feed/']
+  name: Christoph Funk
+  start: 2012/09/24
+dentaku:
+  links:
+  - [Dentaku, 'http://dentaku.wazong.de/', 'http://dentaku.wazong.de/category/blog/feed']
+  name: Thomas Renger
+  start: 2012/09/24
+dirkhaun:
+  links:
+  - [Dirks Hirnableiter, 'http://hirnableiter.tinycities.de/', 'http://hirnableiter.tinycities.de/feeds/hirnableiter.rss']
+  name: Dirk Haun
+  start: 2012/09/24
+gordongeisler:
+  links:
+  - [(blog folgt), 'http://staging.wazong.de/', 'http://staging.wazong.de/feed/']
+  name: Gordon Geisler
+  start: 2012/12/31
+hirnrinde:
+  links:
+  - [Hirnrinde, 'http://www.hirnrinde.de', 'http://www.hirnrinde.de/hirnrinde.php']
+  name: Stefan Evertz
+  start: 2012/09/24
+idrottning:
+  links:
+  - [(blog folgt), 'http://staging.wazong.de/', 'http://staging.wazong.de/feed/']
+  name: Viola Frankenberg
+  start: 2012/12/31
+jantheofel:
+  links:
+  - ["Jans K\xFCchenleben", 'http://www.theofel.de/plog/', 'http://www.theofel.de/plog/index.xml']
+  name: Jan Theofel
+  start: 2012/09/24
+musevg:
+  links:
+  - [(blog folgt), 'http://staging.wazong.de/', 'http://staging.wazong.de/feed/']
+  name: Michael Schommer
+  start: 2012/12/31
+poster4nature:
+  links:
+  - [poster4nature, 'http://www.poster4nature.com/category/blog', 'http://www.poster4nature.com/category/blog/feed/']
+  name: Alexander Beck
+  start: 2012/09/24
+reichepoet:
+  links:
+  - [Der Reiche Poet, 'http://reichepoet.blogspot.de/', 'http://reichepoet.blogspot.com/feeds/posts/default']
+  name: "Ute M\xFCndlein"
+  start: 2012/09/24
+  twitter: false
+roadkill:
+  links:
+  - [Hinten beim Bier, 'http://www.hintenbeimbier.de/', 'http://www.hintenbeimbier.de/feed/']
+  name: Stefan Sommer
+  start: 2012/09/24
+spacedani:
+  links:
+  - [Danigee, 'http://www.danigee.de/', 'http://www.danigee.de/feed/']
+  name: Danijela Grgic
+  start: 2012/10/01
+sympatexter:
+  links:
+  - [Sympatexter, 'http://www.sympatexter.de/', 'http://www.sympatexter.de/feed']
+  name: "Judith B\xF6hm"
+  skip: [2012/10/15, 2012/11/10]
+  start: 2012/09/24
+werkstatt:
+  links:
+  - [Wissenswerkstatt, 'http://www.wissenswerkstatt.net/', 'http://www.wissenswerkstatt.net/feed/atom/']
+  name: Marc Scheloske
+  start: 2012/09/24

settings.py

@@ -9,7 +9,8 @@ def load_settings():
     config['start_date']=configfile.get("general","start_date")
 
     config['username']=configfile.get("blogsettings","username")
+    config['password']=configfile.get("blogsettings","password")
     config['xmlrpc_endpoint']=configfile.get("blogsettings","xmlrpc_endpoint")
     config['blog_id']=configfile.get("blogsettings","blog_id")
     config['participants_page_id']=configfile.get("blogsettings","participants_page_id")
-    return config
+    return config

templates/email.txt

@@ -8,7 +8,7 @@ PUNTED for balance ≥$30: ${", ".join(sorted(punt))}
 % endif
 
 People who posted:
-% for u in sorted(good, key=lambda u:u.username):
+% for u in sorted(good, key=lambda u:u.name[u.name.find(' '):].lower()):
  ${u.username}:
  % for p in u.weeks[week]:
  - ${p['url']}
@@ -30,7 +30,7 @@ People who are currently skipped:
 % endif
 
 Beer pool:
-This week: € ${5 * len(lame)}
+This Week: € ${5 * len(lame)}
 Total:     € ${pool}
 Paid:      € ${paid}
 Events:    € ${event}

templates/users.tmpl

@@ -1,17 +1,17 @@
       <table id='participants'nowrap>
         <tr>
-          <th>Who</th>
+          <th>Name</th>
           <th>Twitter</th>
-          <th>Blog link</th>
+          <th>Blog</th>
-          <th>Start Week</th>
+          <th>Start</th>
-          <th>Skipped Weeks</th>
+          <th>nicht gewertet</th>
         </tr>
-% for u in sorted(userlist, key=lambda u:u.username):
+% for u in sorted(userlist, key=lambda u:u.name[u.name.find(' '):].lower()):
         <tr>
           <td align="left" valign="top">${u.name}</td>
           <td align="left" valign="top">
           % if u.twitter != False:
-            <a href="https://twitter.com/#!/${u.username}">@${u.username}</a>
+            @<a href="http://twitter.com/${u.username}">${u.username}</a>
           % endif
           </td>
           <td align="left" valign="top">
@@ -20,13 +20,13 @@
            <a href="${a[1]}">${a[0]}</a>
             % endfor
            % else:
-             Undecided
+             fehlt noch
            % endif
           </td>
           <td align="left" valign="top"> ${u.start_de} </td>
           <td align="left" valign="top">
           % if u.end:
-            Punted<br>
+            Ausgeschieden<br>
           % endif
           % if u.skip:
             ${u.skip}

templates/week.tmpl

@@ -94,4 +94,4 @@ Results for week beginning ${week_start.strftime("%F")}
 % for (u) in sorted(punted, key=lambda p:p.username):
 <li>${u.username} (${u.end})</li>
 % endfor
-</ul>
+</ul>

update-participants.py

@@ -9,17 +9,10 @@ import settings
 
 config=settings.load_settings()
 
-try:
-    subprocess.call(['stty', '-echo'])
-    passwd = raw_input("Password for %s: " % (config['username'],))
-    print
-finally:
-    subprocess.call(['stty', 'echo'])
-
 x = xmlrpclib.ServerProxy(config['xmlrpc_endpoint'])
-page = x.wp.getPage(config['blog_id'], config['participants_page_id'], config['username'], passwd)
+page = x.wp.getPage(config['blog_id'], config['participants_page_id'], config['username'], config['password'])
 
 text = render.render_template('templates/users.tmpl')
 page['description'] = text
 
-x.wp.editPage(config['blog_id'], config['participants_page_id'], config['username'], passwd,page,True)
+x.wp.editPage(config['blog_id'], config['participants_page_id'], config['username'], config['password'],page,True)