Mercurial > ldcheck / file diff

--- a/webfront.py	Fri Sep 18 21:57:36 2020 +0300
+++ b/webfront.py	Fri Sep 18 23:51:45 2020 +0300
@@ -1,12 +1,19 @@
 #!/usr/bin/env python3
 from flask import Flask, render_template, redirect, request
 from ldcheck import appname, version, version_string
-from ldcheck import load_config, find_ldconfig_ldr_paths
 from parse import read_ldraw
 from testsuite import load_tests, check_model, problem_text, all_problem_types
 
 app = Flask(appname)
 
+from ldcheck import LDrawContext
+try:
+    context = LDrawContext()
+except RuntimeError as error:
+    from sys import stderr, exit
+    print('error:', str(error), file = stderr)
+    exit(1)
+
 def format_report_html(report, model, test_suite):
     messages = []
     for problem in report['problems']:
@@ -37,12 +44,7 @@
             return redirect(request.url)
         file = request.files['file']
         filename = file.filename
-        config = load_config()
-        model = read_ldraw(
-            file.stream,
-            name = filename,
-            ldraw_directories = config['libraries'],
-        )
+        model = read_ldraw(file.stream, name = filename, context = context)
         report = check_model(model, test_suite)
 
         # Amend human-readable messages into the report