ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make our schema validation more compact and flexible

Browse source
This commit is contained in:
Zach White 2021-06-21 12:30:26 -07:00
parent 846da06380
commit 6d20b28354
3 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/python/qmk/cli/format/json.py
View file

@ -8,7 +8,7 @@ from jsonschema import ValidationError
from milc import cli
from qmk.info import info_json
from qmk.json_schema import json_load, keyboard_validate
from qmk.json_schema import json_load, validate
from qmk.json_encoders import InfoJSONEncoder, KeymapJSONEncoder
from qmk.path import normpath
@ -23,14 +23,13 @@ def format_json(cli):
if cli.args.format == 'auto':
try:
keyboard_validate(json_file)
validate(json_file, 'qmk.keyboard.v1')
json_encoder = InfoJSONEncoder
except ValidationError as e:
cli.log.warning('File %s did not validate as a keyboard:\n\t%s', cli.args.json_file, e)
cli.log.info('Treating %s as a keymap file.', cli.args.json_file)
json_encoder = KeymapJSONEncoder
elif cli.args.format == 'keyboard':
json_encoder = InfoJSONEncoder
elif cli.args.format == 'keymap':