Minor code re-arrangement.

[berlin-corona-table] / enhance_table.py

diff --git a/enhance_table.py b/enhance_table.py
index 2b6bb8dc8ff7fcc4f51cb279a44671294f4a0d79..774b333a77cf96951609c4363f219f96d158244a 100755 (executable)
--- a/enhance_table.py
+++ b/enhance_table.py
@@ -1,11 +1,5 @@
 #!//usr/bin/env python3
 
-import sys
-if len(sys.argv) != 2:
-    print('Expecting infections table file path as only argument.')
-    exit(1)
-infections_table = sys.argv[1]
-
 # District population numbers as per Wikipedia.
 district_pops = {
   'CW': 342332,
@@ -23,10 +17,41 @@ district_pops = {
   'sum': 3754418,
 }
 
+# Read infections table file lines.
+import sys
+if len(sys.argv) != 2:
+    print('Expecting infections table file path as only argument.')
+    exit(1)
+infections_table = sys.argv[1]
 f = open(infections_table, 'r')
 lines = f.readlines()
 f.close()
 
+# Basic input validation.
+import datetime
+header_elements = lines[0].split()
+if set(header_elements) != district_pops.keys() or \
+       len(header_elements) != len(district_pops.keys()):
+    raise Exception('infections table: invalid header')
+line_count = 0
+for line in lines[1:]:
+    line_count += 1
+    fields = line.split()
+    if len(header_elements) != len(fields) - 1:
+        raise Exception('infections table: too many elements on line %s',
+                        line_count)
+    try:
+        datetime.date.fromisoformat(fields[0])
+    except ValueError:
+        raise Exception('infections table: bad ISO date on line %s',
+                        line_count)
+    for field in fields[1:]:
+        try:
+            int(field)
+        except ValueError:
+            raise Exception('infections table: bad value on line %s',
+                            line_count)
+
 # Parse first table file line for the names and order of districts.
 db = {}
 sorted_districts = []