From bf55da2cf4d0bb97d6be2db2210fb450084dd30f Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Tue, 2 Oct 2012 09:29:33 +0200 Subject: [PATCH 01/19] Update for 2012/09/17 --- ledger | 1 + 1 file changed, 1 insertion(+) diff --git a/ledger b/ledger index e69de29..8b13789 100644 --- a/ledger +++ b/ledger @@ -0,0 +1 @@ + From 385659ceaca4c42686854a4727ac7f3ad597f7fc Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Tue, 2 Oct 2012 09:30:13 +0200 Subject: [PATCH 02/19] Update for 2012/09/24 --- ledger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ledger b/ledger index 8b13789..b28b04f 100644 --- a/ledger +++ b/ledger @@ -1 +1,3 @@ + + From f86d76538e4bc1e54d9348f7e184feaaa127da4f Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Tue, 2 Oct 2012 09:30:54 +0200 Subject: [PATCH 03/19] Update for 2012/10/01 --- ledger | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ledger b/ledger index b28b04f..b28366f 100644 --- a/ledger +++ b/ledger @@ -1,3 +1,8 @@ + + +2012-10-08 Week 2 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 4c0124d5416495960a55ef8715156be39e05e93a Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Tue, 2 Oct 2012 10:04:55 +0200 Subject: [PATCH 04/19] example payment --- ledger | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ledger b/ledger index b28366f..45b7379 100644 --- a/ledger +++ b/ledger @@ -1,8 +1,8 @@ - - - - 2012-10-08 Week 2 User:hirnrinde $-5 Pool:Owed:hirnrinde + +2012-10-09 Einzahlung + Pool:Owed:hirnrinde $-5 + Pool:Paid From c6b365b90e95f6f979394538eb153abaf5f7c18b Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sat, 6 Oct 2012 23:33:52 +0200 Subject: [PATCH 05/19] Update for 2012/10/01 --- ledger | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ledger b/ledger index 45b7379..24dfb02 100644 --- a/ledger +++ b/ledger @@ -6,3 +6,10 @@ 2012-10-09 Einzahlung Pool:Owed:hirnrinde $-5 Pool:Paid + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 069775d716d0eacecff21beebd7dfc6f233cdc07 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sat, 6 Oct 2012 23:35:04 +0200 Subject: [PATCH 06/19] Update for 2012/10/01 --- ledger | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ledger b/ledger index 24dfb02..85dac52 100644 --- a/ledger +++ b/ledger @@ -13,3 +13,11 @@ 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From e36bd3b1ac252f6496070146c844def618771a4c Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sat, 6 Oct 2012 23:35:28 +0200 Subject: [PATCH 07/19] Update for 2012/10/01 --- ledger | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ledger b/ledger index 85dac52..e541e4c 100644 --- a/ledger +++ b/ledger @@ -21,3 +21,11 @@ 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 646aecb26c16bc22c319d7d4125232198f6fd56f Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sat, 6 Oct 2012 23:38:48 +0200 Subject: [PATCH 08/19] Update for 2012/10/01 --- ledger | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ledger b/ledger index e541e4c..46db354 100644 --- a/ledger +++ b/ledger @@ -29,3 +29,11 @@ 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 0b0ec04e9e3de2110f2180dcb0d3145212d31fc4 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sat, 6 Oct 2012 23:39:17 +0200 Subject: [PATCH 09/19] Update for 2012/10/01 --- ledger | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ledger b/ledger index 46db354..994756e 100644 --- a/ledger +++ b/ledger @@ -37,3 +37,11 @@ 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From c26a3e5bb341a4cbdabc2030655d50e55a346968 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:26:21 +0200 Subject: [PATCH 10/19] Reset ledger --- ledger | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/ledger b/ledger index 994756e..45b7379 100644 --- a/ledger +++ b/ledger @@ -6,42 +6,3 @@ 2012-10-09 Einzahlung Pool:Owed:hirnrinde $-5 Pool:Paid - -2012-10-08 Week 2, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - - -2012-10-08 Week 2, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - - -2012-10-08 Week 2, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - - -2012-10-08 Week 2, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - - -2012-10-08 Week 2, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde From 6a1f20ffad28edecf116a4c2fc705b470a0bdb0b Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:32:00 +0200 Subject: [PATCH 11/19] Update for 2012/10/01 --- ledger | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ledger b/ledger index 45b7379..24dfb02 100644 --- a/ledger +++ b/ledger @@ -6,3 +6,10 @@ 2012-10-09 Einzahlung Pool:Owed:hirnrinde $-5 Pool:Paid + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 8fc0c642e7cee92244ef550fb408cb26fcf359e3 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:32:16 +0200 Subject: [PATCH 12/19] Update for 2012/10/01 --- ledger | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ledger b/ledger index 24dfb02..85dac52 100644 --- a/ledger +++ b/ledger @@ -13,3 +13,11 @@ 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + + +2012-10-08 Week 2, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-08 Week 2, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 7d7fed6c4d1831ffaf00a80bdfde639fa04f6386 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:34:54 +0200 Subject: [PATCH 13/19] Update for 2012/10/08 --- ledger | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ledger b/ledger index 85dac52..240e707 100644 --- a/ledger +++ b/ledger @@ -21,3 +21,20 @@ 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + + +2012-10-15 Week 3, Blog 1 + User:ChemieEmma $-5 + Pool:Owed:ChemieEmma +2012-10-15 Week 3, Blog 2 + User:ChemieEmma $-5 + Pool:Owed:ChemieEmma +2012-10-15 Week 3, Blog 1 + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-15 Week 3, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-15 Week 3, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From c13f19e0d3990c0ba4ed501ada2a9f3827e0d27e Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:36:47 +0200 Subject: [PATCH 14/19] Testing punt --- ledger | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/ledger b/ledger index 240e707..7df039c 100644 --- a/ledger +++ b/ledger @@ -16,25 +16,9 @@ 2012-10-08 Week 2, Blog sgd - User:dentaku $-5 + User:dentaku $-20 Pool:Owed:dentaku 2012-10-08 Week 2, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde - -2012-10-15 Week 3, Blog 1 - User:ChemieEmma $-5 - Pool:Owed:ChemieEmma -2012-10-15 Week 3, Blog 2 - User:ChemieEmma $-5 - Pool:Owed:ChemieEmma -2012-10-15 Week 3, Blog 1 - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-15 Week 3, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-15 Week 3, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde From 4218c200f842a629f3bcadf00838a0b999b29651 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:45:06 +0200 Subject: [PATCH 15/19] Update for 2012/10/08 --- ledger | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ledger b/ledger index 7df039c..2713a85 100644 --- a/ledger +++ b/ledger @@ -22,3 +22,19 @@ User:hirnrinde $-5 Pool:Owed:hirnrinde + +2012-10-15 Week 3, Blog 1 + User:ChemieEmma $-5 + Pool:Owed:ChemieEmma +2012-10-15 Week 3, Blog 2 + User:ChemieEmma $-5 + Pool:Owed:ChemieEmma +2012-10-15 Week 3, Blog 1 + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-15 Week 3, Blog sgd + User:dentaku $-5 + Pool:Owed:dentaku +2012-10-15 Week 3, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From f78289d168e57c0038b65f2276025a7f2fd80cdb Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:45:14 +0200 Subject: [PATCH 16/19] Punts for 2012/10/08 --- bloggers.yml | 112 +++------------------------------------------------ ledger | 4 ++ 2 files changed, 10 insertions(+), 106 deletions(-) diff --git a/bloggers.yml b/bloggers.yml index 1e51a8a..afa0b5d 100644 --- a/bloggers.yml +++ b/bloggers.yml @@ -1,118 +1,18 @@ -BarbaraHoisl: - links: - - [(blog folgt), 'http://staging.wazong.de/', 'http://staging.wazong.de/feed/'] - name: Barbara Hoisl - start: 2012/12/31 ChemieEmma: links: - - [dent in the world (Englisch), 'http://dentintheworld.com/', 'http://dentintheworld.com/feed/atom/'] + - [1, dent in the world (Englisch), 'http://dentintheworld.com/', 'http://dentintheworld.com/feed/atom/'] + - [2, the naked alpaka (Englisch), 'http://thenakedalpaca.com/', 'http://thenakedalpaca.com/feed/atom/'] name: Paula Schramm start: 2012/09/24 -DVDtoday: - links: - - [JKdigital, 'http://jkdigital.de/', 'http://jkdigital.de/feed/'] - name: "J\xFCrgen Kaiser" - start: 2012/09/24 -HubertMayer: - links: - - [Hubert Mayer, 'http://hubert-mayer.de/', 'http://hubert-mayer.de/feed/'] - name: Hubert Mayer - start: 2012/09/24 -TabTwo: - links: - - [Nerd Residenz, 'http://www.nerd-residenz.de/blog/', 'http://www.nerd-residenz.de/blog/index.atom'] - 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: - end: 2012/09/17 + end: 2012/10/08 links: - - [Dentaku, 'http://dentaku.wazong.de/', 'http://dentaku.wazong.de/category/blog/feed'] + - [1, Dentaku, 'http://dentaku.wazong.de/', 'http://dentaku.wazong.de/feed'] + - [sgd, Schlechte Gedichte, 'http://schlechtegedichte.de/', 'http://schlechtegedichte.de/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'] + - [1, Hirnrinde, 'http://www.hirnrinde.de/', 'http://www.hirnrinde.de/hirnrinde.php'] name: Stefan Evertz start: 2012/09/24 -hoomygumb: - links: - - [it's a hoomygumb, 'http://hoomygumb.com/', 'http://hoomygumb.com/feed/'] - name: Jay F. Kay - 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 -lakritzplanet: - links: - - [Lakritzplanet, 'http://www.lakritzplanet.de/', 'http://www.lakritzplanet.de/feed/'] - name: Chritian Kaufmann - start: 2012/09/24 -musevg: - links: - - [(blog folgt), 'http://staging.wazong.de/', 'http://staging.wazong.de/feed/'] - name: Michael Schommer - start: 2012/12/31 -pNachhaltig: - links: - - [praktisch Nachhaltig, 'http://praktisch-nachhaltig.de/news-und-presse/praktisch-nachhaltig-blog', - 'http://staging.wazong.de/feed/'] - name: "Franziska K\xF6ppe" - 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" - 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/ledger b/ledger index 2713a85..c8f763b 100644 --- a/ledger +++ b/ledger @@ -38,3 +38,7 @@ 2012-10-15 Week 3, Blog 1 User:hirnrinde $-5 Pool:Owed:hirnrinde + +2012/10/08 Punt + Pool:Owed:dentaku $-35 + User:dentaku From 3de8f2682656f17a0592fdfa6d58e89db7203ad0 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:46:44 +0200 Subject: [PATCH 17/19] Update for 2012/10/15 --- ledger | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ledger b/ledger index c8f763b..06f46a0 100644 --- a/ledger +++ b/ledger @@ -42,3 +42,13 @@ 2012/10/08 Punt Pool:Owed:dentaku $-35 User:dentaku + +2012-10-22 Week 4, Blog 1 + User:ChemieEmma $-5 + Pool:Owed:ChemieEmma +2012-10-22 Week 4, Blog 2 + User:ChemieEmma $-5 + Pool:Owed:ChemieEmma +2012-10-22 Week 4, Blog 1 + User:hirnrinde $-5 + Pool:Owed:hirnrinde From 9bd17bf520480820543dc53404fe4b7edb5870bf Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:49:59 +0200 Subject: [PATCH 18/19] Reset testing --- bloggers.yml | 1 - ledger | 46 ---------------------------------------------- 2 files changed, 47 deletions(-) diff --git a/bloggers.yml b/bloggers.yml index afa0b5d..efac218 100644 --- a/bloggers.yml +++ b/bloggers.yml @@ -5,7 +5,6 @@ ChemieEmma: name: Paula Schramm start: 2012/09/24 dentaku: - end: 2012/10/08 links: - [1, Dentaku, 'http://dentaku.wazong.de/', 'http://dentaku.wazong.de/feed'] - [sgd, Schlechte Gedichte, 'http://schlechtegedichte.de/', 'http://schlechtegedichte.de/feed/'] diff --git a/ledger b/ledger index 06f46a0..45b7379 100644 --- a/ledger +++ b/ledger @@ -6,49 +6,3 @@ 2012-10-09 Einzahlung Pool:Owed:hirnrinde $-5 Pool:Paid - -2012-10-08 Week 2, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - - -2012-10-08 Week 2, Blog sgd - User:dentaku $-20 - Pool:Owed:dentaku -2012-10-08 Week 2, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - - -2012-10-15 Week 3, Blog 1 - User:ChemieEmma $-5 - Pool:Owed:ChemieEmma -2012-10-15 Week 3, Blog 2 - User:ChemieEmma $-5 - Pool:Owed:ChemieEmma -2012-10-15 Week 3, Blog 1 - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-15 Week 3, Blog sgd - User:dentaku $-5 - Pool:Owed:dentaku -2012-10-15 Week 3, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde - -2012/10/08 Punt - Pool:Owed:dentaku $-35 - User:dentaku - -2012-10-22 Week 4, Blog 1 - User:ChemieEmma $-5 - Pool:Owed:ChemieEmma -2012-10-22 Week 4, Blog 2 - User:ChemieEmma $-5 - Pool:Owed:ChemieEmma -2012-10-22 Week 4, Blog 1 - User:hirnrinde $-5 - Pool:Owed:hirnrinde From a54d80db4e18c8d2460c36fe6d77de28332c5990 Mon Sep 17 00:00:00 2001 From: Thomas Renger Date: Sun, 7 Oct 2012 09:55:42 +0200 Subject: [PATCH 19/19] Change behaviour with multiple blogs to count every slacking blog w ith 5 EUR each. Change render results to reflect this. --- import-feeds.py | 8 ++++---- render.py | 22 +++++++++++++--------- scan-feeds.py | 10 ++++++---- templates/email.txt | 21 +++++++++++++++------ templates/ledger | 6 ++++-- templates/users.tmpl | 2 +- templates/week.tmpl | 38 +++++++++++++++++++++++++++++--------- 7 files changed, 72 insertions(+), 35 deletions(-) diff --git a/import-feeds.py b/import-feeds.py index f4436aa..3506e22 100755 --- a/import-feeds.py +++ b/import-feeds.py @@ -27,12 +27,12 @@ def fetch_links(url): for (name, u) in users.items(): for e in u['links']: - (title, url) = e[0:2] + (title, url) = e[1:3] try: - e[0] = e[0].strip() + e[1] = e[1].strip() except: - e[0] = e[0] - if len(e) == 3: + e[1] = e[1] + if len(e) == 4: continue link = fetch_links(url) if link: diff --git a/render.py b/render.py index 735df0f..b092951 100755 --- a/render.py +++ b/render.py @@ -76,8 +76,6 @@ def render_template(path, week=None, **kwargs): week_start = START + (week * datetime.timedelta(7)) week_end = START + ((week + 1) * datetime.timedelta(7)) - good = [] - lame = [] skip = [] skipped_users = [] userlist = [] @@ -97,7 +95,9 @@ def render_template(path, week=None, **kwargs): u.end = rec.get('end') u.stop = rec.get('stop') u.skip = parse_skip(rec) - u.weeks = report.get(un, []) + u.posts = report.get(un, {}) + u.goodblogs = [] + u.lameblogs = [] userlist.append(u) @@ -118,21 +118,25 @@ def render_template(path, week=None, **kwargs): continue if u.end and parse(u.end, default=START) <= week_start: continue - if should_skip(u.skip, week): skipped_users.append(u) + continue elif user_start > week_start: skip.append(u) - elif len(u.weeks) <= week or not u.weeks[week]: - lame.append(u) - else: - good.append(u) + continue + for blog in u.links: + b=blog[0] + weeks=u.posts[b] + if len(weeks) <= week or not weeks[week]: + u.lameblogs.append(b) + else: + u.goodblogs.append(b) debts = get_debts() 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, skipped_users=skipped_users, userlist=userlist, + skip=skip, skipped_users=skipped_users, userlist=userlist, pool=(get_balance('Pool')-get_balance('Event')), paid=get_balance('Pool:Paid'), event=get_balance('Pool:Event'), debts=debts, punted=punted, **kwargs) diff --git a/scan-feeds.py b/scan-feeds.py index deab8ae..88ff049 100755 --- a/scan-feeds.py +++ b/scan-feeds.py @@ -66,14 +66,16 @@ def parse_feeds(weeks, uri): if len(sys.argv) > 1: for username in sys.argv[1:]: - weeks = log.setdefault(username, []) + blogs = log.setdefault(username, {}) for l in users[username]['links']: - parse_feeds(weeks, l[2]) + weeks = blogs.setdefault(l[0], []) + parse_feeds(weeks, l[3]) else: for (username, u) in users.items(): - weeks = log.setdefault(username, []) + blogs = log.setdefault(username, {}) for l in u['links']: - parse_feeds(weeks, l[2]) + weeks = blogs.setdefault(l[0], []) + parse_feeds(weeks, l[3]) with open('out/report.yml', 'w') as f: yaml.safe_dump(log, f) diff --git a/templates/email.txt b/templates/email.txt index 36e7279..5adf587 100644 --- a/templates/email.txt +++ b/templates/email.txt @@ -2,16 +2,25 @@ Subject: IRON BLOGGER results for the week beginning ${week_start.strftime("%F")} To: ${mail} -SLACKERS: ${", ".join(sorted([u.username for u in lame]))} +SLACKERS: +<% lame=0 %> +% for u in sorted(userlist, key=lambda u:u.name[u.name.rfind(' '):].lower()): + % for b in u.lameblogs: + <% lame+=1 %> - ${u.name} in ${b} + % endfor +% endfor + % if punt: PUNTED for balance ≥$30: ${", ".join(sorted(punt))} % endif People who posted: -% for u in sorted(good, key=lambda u:u.name[u.name.rfind(' '):].lower()): - ${u.name} (${u.username}): - % for p in u.weeks[week]: - - ${p['url']} +% for u in sorted(userlist, key=lambda u:u.name[u.name.rfind(' '):].lower()): + % for b in u.goodblogs: + ${u.name} in ${b} (${u.username}): + % for p in u.posts[b][week]: + - ${p['url']} + % endfor % endfor % endfor @@ -30,7 +39,7 @@ People who are currently skipped: % endif Beer pool: -This Week: € ${5 * len(lame)} +This Week: € ${5 * lame} Total: € ${pool} Paid: € ${paid} Events: € ${event} diff --git a/templates/ledger b/templates/ledger index 9d7e04d..3c94236 100644 --- a/templates/ledger +++ b/templates/ledger @@ -1,6 +1,8 @@ # This Python file uses the following encoding: utf-8 -% for u in sorted(lame, key=lambda u:u.username): -${week_end.strftime("%F")} Week ${week} +% for u in sorted(userlist, key=lambda u:u.username): +% for b in u.lameblogs: +${week_end.strftime("%F")} Week ${week}, Blog ${b} User:${u.username} $-5 Pool:Owed:${u.username} % endfor +% endfor diff --git a/templates/users.tmpl b/templates/users.tmpl index 814425c..d922f44 100644 --- a/templates/users.tmpl +++ b/templates/users.tmpl @@ -17,7 +17,7 @@ % if u.links: % for a in u.links: - ${a[0]} + ${a[1]} % endfor % else: fehlt noch diff --git a/templates/week.tmpl b/templates/week.tmpl index f0807bc..5f4bc36 100644 --- a/templates/week.tmpl +++ b/templates/week.tmpl @@ -1,30 +1,48 @@ -Zusammenfassung für die Woche ab ${week_start.strftime("%d.%m.%Y")}: +Zusammenfassung der Woche ab ${week_start.strftime("%d.%m.%Y")}:

Die Fleißigen:

-% for u in sorted(good, key=lambda u:u.name[u.name.rfind(' '):].lower()): +% for u in sorted(userlist, key=lambda u:u.name[u.name.rfind(' '):].lower()): +% for g in u.goodblogs: +% for b in u.links: +% if b[0] == g:
${u.name} \ % if u.twitter != False: - @${u.username} \ + (@${u.username}) \ + % endif + % if len(u.links) != 1: + in ${b[1]} \ % endif :
+% endif +% endfor +% endfor % endfor
-

Die Faulen:

+

Die Faulen:

<% lame=0 %>
    -% for u in sorted(lame, key=lambda u:u.name[u.name.rfind(' '):].lower()): -
  • ${u.name} \ +% for u in sorted(userlist, key=lambda u:u.name[u.name.rfind(' '):].lower()): +% for g in u.lameblogs: +% for b in u.links: +% if b[0] == g: +
  • ${u.name} <% lame+=1 %> \ % if u.twitter != False: @${u.username} \ % endif + % if len(u.links) != 1: + in ${b[1]} \ + % endif
    • +% endif +% endfor +% endfor % endfor
@@ -65,9 +83,9 @@ Zusammenfassung für die Woche ab ${week_start.strftime("%d.%m.%Y")}:

Kasse:

- + - +
Diese Woche: ${5 * len(lame)} €
Diese Woche: ${5 * lame} €
Insgesamt: ${pool} €
Beglichen: ${paid} €
beglichen: ${paid} €
verfeiert: ${event} €
@@ -89,9 +107,11 @@ Zusammenfassung für die Woche ab ${week_start.strftime("%d.%m.%Y")}: %endif +% if punted:

Zuvor ausgeschieden (müssen 30 € für den Wiedereinstieg bezahlen):

    % for (u) in sorted(punted, key=lambda p:p.name[p.name.rfind(' '):].lower()):
  • ${u.name} (seit ${u.end_de})
    • % endfor
+% endif