Preprocess: output warnings only if --verbose flag is given

mokibit · mokibit · commit 91cab381dc64 · 2018-03-30T19:56:31.000+03:00
diff --git a/preprocess_qch.py b/preprocess_qch.py
@@ -18,29 +18,49 @@
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
 from premailer import transform
-import os
 import argparse
 import concurrent.futures
+import cssutils
+import logging
+import os
+import warnings
+import io
+import shutil
 
 def preprocess_html_merge_css(src_path, dst_path):
+    log = logging.Logger('ignore')
+    output = io.StringIO()
+    handler = logging.StreamHandler(stream=output)
+    formatter = logging.Formatter('%(levelname)s, %(message)s')
+    handler.setFormatter(formatter)
+    log.addHandler(handler)
+    cssutils.log.setLog(log)
+
     with open(src_path, 'r') as a_file:
-        content = transform(a_file.read(), base_url=src_path)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            content = transform(a_file.read(), base_url=src_path)
         head = os.path.dirname(dst_path)
         os.makedirs(head, exist_ok=True)
         f = open(dst_path,"w")
         f.write(content)
 
+    return output.getvalue()
+
 def main():
 
     parser = argparse.ArgumentParser(prog='preprocess_qch.py')
-    parser.add_argument('--src', required = True, type=str,
+    parser.add_argument('--src', required=True, type=str,
             help='Source directory where raw website copy resides')
-    parser.add_argument('--dst', required = True, type=str,
+    parser.add_argument('--dst', required=True, type=str,
             help='Destination folder to put preprocessed archive to')
+    parser.add_argument('--verbose', action='store_true', default=False,
+            help='If set, verbose output is produced')
     args = parser.parse_args()
 
-    source_root = str(args.src)
+    source_root = args.src
     dest_root = args.dst
+    verbose = args.verbose
 
     paths_list = []
     for root, dirs, files in os.walk(source_root):
@@ -57,10 +77,12 @@ def main():
                                      src_path, dst_path), i)
                     for i, (src_path, dst_path) in enumerate(paths_list) ]
 
-        for tuple in futures:
-            future, i = tuple
-            future.result()
-            print('Processed file: {}/{}'.format(i, len(paths_list)))
+        for future, i in futures:
+            print('Processing file: {}/{}: {}'.format(i, len(paths_list),
+                                                      paths_list[i][1]))
+            output = future.result()
+            if verbose:
+                print(output)
 
 if __name__ == "__main__":
     main()
