diff --git a/bloggers.yml b/bloggers.yml index 078118c..524c566 100644 --- a/bloggers.yml +++ b/bloggers.yml @@ -1,11 +1,92 @@ -chaosblog: +ChemieEmma: links: - - [Chaosblog, 'http://chaosblog.wordpress.com/', 'http://chaosblog.wordpress.com/feed'] - name: Marcus S. - start: 2012/01/01 -username: + - [dent in the world (Englisch), 'http://dentintheworld.com/', 'http://dentintheworld.com/feed/atom/'] + name: Paula Schramm + start: 2012/09/24 +HubertMayer: links: - - [Blogname 01,'http://blog-URL.tld/'] - - [Blogname 02,'http://blog-URL02.tld/'] - name: Jon Doe - start: YYYY/MM/DD \ No newline at end of file + - [Hubert Mayer - was mich so alles bewegt, 'http://hubert-mayer.de/', 'http://hubert-mayer.de/feed/'] + name: Hubert Mayer + start: 2012/09/24 +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 diff --git a/settings.py b/settings.py index 484198e..5ceda41 100755 --- a/settings.py +++ b/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 \ No newline at end of file + return config diff --git a/templates/email.txt b/templates/email.txt index cd4dc40..904b70f 100644 --- a/templates/email.txt +++ b/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} diff --git a/templates/users.tmpl b/templates/users.tmpl index 2f0a798..814425c 100644 --- a/templates/users.tmpl +++ b/templates/users.tmpl @@ -1,17 +1,17 @@ - + - - - + + + -% for u in sorted(userlist, key=lambda u:u.username): +% for u in sorted(userlist, key=lambda u:u.name[u.name.find(' '):].lower()):
WhoName TwitterBlog linkStart WeekSkipped WeeksBlogStartnicht gewertet
${u.name} % if u.twitter != False: - @${u.username} + @${u.username} % endif @@ -20,13 +20,13 @@ ${a[0]} % endfor % else: - Undecided + fehlt noch % endif ${u.start_de} % if u.end: - Punted
+ Ausgeschieden
% endif % if u.skip: ${u.skip} diff --git a/templates/week.tmpl b/templates/week.tmpl index 5a20301..77a8377 100644 --- a/templates/week.tmpl +++ b/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):
  • ${u.username} (${u.end})
  • % endfor - \ No newline at end of file + diff --git a/update-participants.py b/update-participants.py index 20f4862..bdcb012 100755 --- a/update-participants.py +++ b/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) \ No newline at end of file +x.wp.editPage(config['blog_id'], config['participants_page_id'], config['username'], config['password'],page,True)