verbose

www/mkAll.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import sys
-import os
 import re
 import subprocess
 
@@ -37,6 +36,11 @@ namen = {
         'Tzum': 'Literatuur'
 }
 
+verbose=False
+if sys.argv[1] == '-v':
+    verbose=True
+    sys.argv = sys.argv[:1] + sys.argv[2:]
+
 ep=sys.argv[1]
 if not re.match('^2[0-9][0-9][0-9]-[0-5][0-9]$', ep):
     print("Ongeldig patroon '", ep, "', moet yyyy-ww zijn")
@@ -47,23 +51,20 @@ week=ep[5:].lstrip('0')
 
 for base in ('algemeen', 'VRT', 'groningen', 'AT5', 'Tzum'):
     name = namen[base]
-    fp = open(name + '.html', 'wt', encoding='utf-8')
-    fp.write(head.format(name, jaar, week, name, jaar, week))
-    fp.flush()
-    for part in ('nieuwe-namen', 'nieuwe-woorden', 'personen', 'overige-namen', 'locaties', 'organisaties'):
-        if part == 'locaties':
-            fp.write('</div>\n<div class="main next">\n')
-            fp.flush()
-        top = ''
-        if part.startswith('nieuwe'):
-            top = '.t20'
-        subprocess.run(
-                ['./top2html.py', '../data/{}-{}-{}-4{}'.format(base, part, ep, top)],
-                stdout = fp,
-                check = False)
-    fp.write(tail)
-    fp.close()
-
-
-
-
+    with open(name + '.html', 'wt', encoding='utf-8') as fp:
+        fp.write(head.format(name, jaar, week, name, jaar, week))
+        fp.flush()
+        for part in ('nieuwe-namen', 'nieuwe-woorden', 'personen', 'overige-namen', 'locaties', 'organisaties'):
+            if verbose:
+                print(base, part)
+            if part == 'locaties':
+                fp.write('</div>\n<div class="main next">\n')
+                fp.flush()
+            top = ''
+            if part.startswith('nieuwe'):
+                top = '.t20'
+            subprocess.run(
+                    ['./top2html.py', '../data/{}-{}-{}-4{}'.format(base, part, ep, top)],
+                    stdout = fp,
+                    check = False)
+        fp.write(tail)