Add json_loads(), json_load() and json_save() to common, create…

… global config.schema object

Sming/Components/Storage/Tools/hwconfig/common.py

@@ -3,6 +3,8 @@
 #
 
 import sys, json, platform
+from rjsmin import jsmin
+from collections import OrderedDict
 
 quiet = False
 
@@ -91,6 +93,17 @@ def contains_whitespace(s):
     return ''.join(s.split()) != s
 
 
+def json_loads(s):
+    return json.loads(jsmin(s), object_pairs_hook=OrderedDict)
+
+def json_load(filename):
+    with open(filename) as f:
+        return json_loads(f.read())
+
+def json_save(data, filename):
+    with open(filename, "w") as f:
+        json.dump(data, f, indent=4)
+
 def to_json(obj):
     return json.dumps(obj, indent=4)
 

Sming/Components/Storage/Tools/hwconfig/config.py

@@ -3,12 +3,22 @@
 #
 
 import os, partition, storage, copy
-from rjsmin import jsmin
 from common import *
 from builtins import classmethod
 
 HW_EXT = '.hw'
 
+class Schema(dict):
+    def __init__(self, filename):
+        self.schema = json_load(filename)
+
+    def __getitem__(self, name):
+        return self.schema['definitions'][name]
+
+
+
+schema = Schema(os.environ['HWCONFIG_SCHEMA'])
+
 def get_config_dirs():
     s = os.environ['HWCONFIG_DIRS']
     dirs = s.replace('  ', ' ').split(' ')
@@ -21,7 +31,7 @@ def load_option_library():
         filename = fixpath(d) + '/options.json'
         if os.path.exists(filename):
             with open(filename) as f:
-                data = json.loads(jsmin(f.read()))
+                data = json_loads(f.read())
                 library.update(data)
     return library
 
@@ -82,8 +92,7 @@ def load(self, name):
         """
         filename = find_config(name)
         self.depends.append(filename)
-        with open(filename) as f:
-            data = json.loads(jsmin(f.read()))
+        data = json_load(filename)
         self.parse_dict(data)
 
     def parse_options(self, options):

Sming/Components/Storage/Tools/hwconfig/editor.py

@@ -1,4 +1,4 @@
-import argparse, os, partition, configparser, string
+import argparse, os, config, partition, configparser, string
 from common import *
 from config import *
 import tkinter as tk
@@ -68,9 +68,6 @@ def resolve_id(config, id):
     if part is not None:
         return part
 
-def json_loads(s):
-    return json.loads(jsmin(s), object_pairs_hook=OrderedDict)
-
 class Field:
     """Manages widget and associated variable
     """
@@ -99,7 +96,7 @@ def __init__(self, editor, objectType, dictName, obj, enumDict):
         self.enumDict = enumDict
         self.obj = obj
         self.name = obj.name
-        self.schema = editor.schema[objectType]
+        self.schema = config.schema[objectType]
         self.allow_delete = False
         baseConfig = self.editor.getBaseConfig()
         optionBaseConfig = self.editor.getOptionBaseConfig()
@@ -752,15 +749,6 @@ def select(self):
             tree.selection_set(id)
 
 
-class Schema(dict):
-    def __init__(self, filename):
-        with open(filename) as f:
-            self.schema = json.load(f, object_pairs_hook=OrderedDict)
-
-    def __getitem__(self, name):
-        return self.schema['definitions'][name]
-
-
 class Editor:
     def __init__(self, root):
         root.title(app_name)
@@ -774,8 +762,6 @@ def __init__(self, root):
     def initialise(self):
         self.main.option_add('*tearOff', False)
 
-        self.schema = Schema(os.environ['HWCONFIG_SCHEMA'])
-
         hwFilter = [('Hardware Profiles', '*' + HW_EXT)]
 
         # Menus
@@ -803,8 +789,7 @@ def fileSave():
                 ext = os.path.splitext(filename)[1]
                 if ext != HW_EXT:
                     filename += HW_EXT
-                with open(filename, "w") as f:
-                    json.dump(self.json, f, indent=4)
+                json_save(self.json, filename)
 
         # Toolbar
         toolbar = ttk.Frame(self.main)
@@ -939,16 +924,17 @@ def verify_config(self, json_config):
 
     def set_json(self, json_config):
         # Keep output order consistent
-        self.json = {}
-        for k in self.schema['Config']['properties'].keys():
+        self.json = OrderedDict()
+        for k in config.schema['Config']['properties'].keys():
             if k in json_config:
                 self.json[k] = json_config[k]
 
     def reset(self):
         self.tree.clear()
         self.map.clear()
         self.status.set('')
-        self.json = {"name": "New Profile"}
+        self.json = OrderedDict()
+        self.json['name'] = 'New Profile'
         self.json['base_config'] = 'standard'
         self.reload()
         self.updateWindowTitle()

Sming/Components/Storage/Tools/hwconfig/hwconfig.py

@@ -6,6 +6,7 @@
 import common, argparse, os, partition
 from common import *
 from config import Config
+from config import schema as config_schema
 
 def openOutput(path):
     if path == '-':
@@ -24,10 +25,8 @@ def handle_validate(args, config, part):
     # Validate resulting hardware configuration against schema
     try:
         from jsonschema import Draft7Validator
-        inst = json.loads(config.to_json())
-        with open(os.environ['HWCONFIG_SCHEMA']) as f:
-            schema = json.load(f)
-        v = Draft7Validator(schema)
+        inst = json_loads(config.to_json())
+        v = Draft7Validator(config_schema)
         errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
         if errors != []:
             for e in errors: