home · contact · privacy
Output both .txt and .html variants.
authorChristian Heller <c.heller@plomlompom.de>
Fri, 3 Jul 2020 17:39:41 +0000 (19:39 +0200)
committerChristian Heller <c.heller@plomlompom.de>
Fri, 3 Jul 2020 17:39:41 +0000 (19:39 +0200)
enhance_table.py
update.sh

index 774b333a77cf96951609c4363f219f96d158244a..02a7ac9b30b8cd0375a79a49468e2dc5c19e3d77 100755 (executable)
@@ -17,12 +17,15 @@ district_pops = {
   'sum': 3754418,
 }
 
-# Read infections table file lines.
+# Read infections table path and output type.
 import sys
-if len(sys.argv) != 2:
-    print('Expecting infections table file path as only argument.')
+if len(sys.argv) != 3:
+    print('Expecting infections table file path and output type as only arguments.')
     exit(1)
 infections_table = sys.argv[1]
+output_type = sys.argv[2]
+
+# Read infections table file lines.
 f = open(infections_table, 'r')
 lines = f.readlines()
 f.close()
@@ -106,8 +109,50 @@ for i in range(len(sorted_dates)):
         db[district][date]['week_average'] = week_sum / 7
         db[district][date]['week_incidence'] = (week_sum / district_pop) * 100000
 
-# Explain what this is.
-intro = """Table of Berlin's Corona infection number development by districts.
+# Optimized for web browser viewing.
+if output_type == 'html':
+    print('<html>')
+    print('<style>')
+    print('table, tr, th, td { border: 1px solid black; }')
+    print('</style>')
+    print('<table>')
+    print('<tr>')
+    print('<th>date</th>')
+    for district in sorted_districts:
+        print('<th>%s</th>' % district)
+    print('</tr>')
+    sorted_dates.reverse()
+    for date in sorted_dates:
+        print('<tr>')
+        print('<td>%s</td>' % date)
+        for district in sorted_districts:
+            district_data = db[district][date]
+            week_sum = week_avg = week_inc = ''
+            new_infections = district_data['new_infections']
+            if 'week_sum' in district_data:
+                week_sum = '%s' % district_data['week_sum']
+            if 'week_average' in district_data:
+                week_avg = '%.1f' % district_data['week_average']
+            if 'week_incidence' in district_data:
+                week_inc = '%.1f' % district_data['week_incidence']
+            print('<td>')
+            print('<table>')
+            print('<tr><th>new</th><td>%s</td></tr>' % new_infections)
+            print('<tr><th>wsum</th><td>%s</td></tr>' % week_sum)
+            print('<tr><th>wavg</th><td>%s</td></tr>' % week_avg)
+            print('<tr><th>winc</th><td>%s</td></tr>' % week_inc)
+            print('</table>')
+            print('</td>')
+        print('</tr>')
+    print('</table>')
+    print('</html>')
+
+# Optimized for in-terminal curl.
+elif output_type == 'txt':
+
+    # Explain what this is.
+    intro = \
+"""Table of Berlin's Corona infection number development by districts.
 Updated daily around 9pm.
 
 Abbrevations/explanations:
@@ -131,54 +176,55 @@ winc: incidence (x per 100k inhabitants) of new infections for last 7 days
 
 Source code: https://plomlompom.com/repos/?p=berlin-corona-table
 """
-print(intro)
-
-# Output table of enhanced daily infection data, newest on top, separated into
-# 7-day units.
-sorted_dates.reverse()
-weekday_count = 0
-for date in sorted_dates:
-
-    # Week table header.
-    if weekday_count == 0:
-        print(' '*11, '  '.join(sorted_districts[:-1]),
-              sorted_districts[-1], 'wsum', ' wavg', 'winc')
-        week_start_date = date
+    print(intro)
 
-    # Day data line.
-    new_infections = []
-    for district in sorted_districts:
-        new_infections += [db[district][date]['new_infections']]
-    week_sum = week_avg = week_inc = ''
-    sum_district = sorted_districts[-1]
-    sum_district_data = db[sum_district][date]
-    if 'week_sum' in sum_district_data:
-        week_sum = '%4s' % sum_district_data['week_sum']
-    if 'week_average' in sum_district_data:
-        week_avg = '%5.1f' % sum_district_data['week_average']
-    if 'week_incidence' in sum_district_data:
-        week_inc = '%4.1f' % sum_district_data['week_incidence']
-    print(date, ' '.join(['%3s' % infections for infections in new_infections]),
-          week_sum, week_avg, week_inc)
-
-    # Maintain 7-day cycle.
-    weekday_count += 1
-    if weekday_count != 7:
-        continue
+    # Output table of enhanced daily infection data, newest on top,
+    # separated into 7-day units.
+    sorted_dates.reverse()
     weekday_count = 0
-
-    # After each 7 days, print summary for individual districts.
-    weekly_sums = []
-    weekly_avgs = []
-    weekly_incs = []
-    for district in sorted_districts[:-1]:
-        weekly_sums += [db[district][week_start_date]['week_sum']]
-        weekly_avgs += [db[district][week_start_date]['week_average']]
-        weekly_incs += [db[district][week_start_date]['week_incidence']]
-    print()
-    print('district stats for week from %s to %s:' % (date, week_start_date))
-    print(' '*7, '    '.join(sorted_districts[:-1]))
-    print('wsum', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
-    print('wavg', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
-    print('winc', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
-    print()
+    sum_district = sorted_districts[-1]
+    for date in sorted_dates:
+
+        # Week table header.
+        if weekday_count == 0:
+            print(' '*11, '  '.join(sorted_districts[:-1]),
+                  sorted_districts[-1], 'wsum', ' wavg', 'winc')
+            week_start_date = date
+
+        # Day data line.
+        new_infections = []
+        for district in sorted_districts:
+            new_infections += [db[district][date]['new_infections']]
+        week_sum = week_avg = week_inc = ''
+        sum_district_data = db[sum_district][date]
+        if 'week_sum' in sum_district_data:
+            week_sum = '%4s' % sum_district_data['week_sum']
+        if 'week_average' in sum_district_data:
+            week_avg = '%5.1f' % sum_district_data['week_average']
+        if 'week_incidence' in sum_district_data:
+            week_inc = '%4.1f' % sum_district_data['week_incidence']
+        print(date, ' '.join(['%3s' % infections
+                              for infections in new_infections]),
+              week_sum, week_avg, week_inc)
+
+        # Maintain 7-day cycle.
+        weekday_count += 1
+        if weekday_count != 7:
+            continue
+        weekday_count = 0
+
+        # After each 7 days, print summary for individual districts.
+        weekly_sums = []
+        weekly_avgs = []
+        weekly_incs = []
+        for district in sorted_districts[:-1]:
+            weekly_sums += [db[district][week_start_date]['week_sum']]
+            weekly_avgs += [db[district][week_start_date]['week_average']]
+            weekly_incs += [db[district][week_start_date]['week_incidence']]
+        print()
+        print('district stats for week from %s to %s:' % (date, week_start_date))
+        print(' '*7, '    '.join(sorted_districts[:-1]))
+        print('wsum', ' '.join(['%5.1f' % wsum for wsum in weekly_sums]))
+        print('wavg', ' '.join(['%5.1f' % wavg for wavg in weekly_avgs]))
+        print('winc', ' '.join(['%5.1f' % winc for winc in weekly_incs]))
+        print()
index 251382711a2637635d4c22184496b2e7e8bf3015..27a9dd1fe476f16009fb0d94f0af5fa62eeccc86 100755 (executable)
--- a/update.sh
+++ b/update.sh
@@ -18,4 +18,5 @@ curl "${CSV_URL}" \
 'END { printf "\n" }' "${filename}" >> "${table_path}" 
 
 # Write enhanced table output to directory served by web server.
-./enhance_table.py "${table_path}" > /var/www/html/berlin_corona.txt
+./enhance_table.py "${table_path}" txt > /var/www/html/berlin_corona.txt
+./enhance_table.py "${table_path}" html > /var/www/html/berlin_corona.html