diff options
| author | Ilya Zhuravlev <whatever@xyz.is> | 2024-09-07 19:49:19 -0600 |
|---|---|---|
| committer | Ilya Zhuravlev <whatever@xyz.is> | 2024-09-07 19:49:19 -0600 |
| commit | a780dd1cb1736b67b2139bf15cb93c932108e8fd (patch) | |
| tree | 6e9bccf1700bfd804643aba6aed8ce219f03b40d /lib/python/qmk/cli/format | |
| parent | bb7961c3c27666c154393bca22aef31f8e60f5b9 (diff) | |
| parent | f0435451446621a0e768c8a9123789b239a325b4 (diff) | |
Merge remote-tracking branch 'qmk/master' into merge-2024-09-07
Diffstat (limited to 'lib/python/qmk/cli/format')
| -rwxr-xr-x | lib/python/qmk/cli/format/json.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/format/json.py b/lib/python/qmk/cli/format/json.py index 87a3837d10..3670294434 100755 --- a/lib/python/qmk/cli/format/json.py +++ b/lib/python/qmk/cli/format/json.py @@ -18,13 +18,20 @@ def _detect_json_format(file, json_data): """ json_encoder = None try: - validate(json_data, 'qmk.user_repo.v1') + validate(json_data, 'qmk.user_repo.v1_1') json_encoder = UserspaceJSONEncoder except ValidationError: pass if json_encoder is None: try: + validate(json_data, 'qmk.user_repo.v1') + json_encoder = UserspaceJSONEncoder + except ValidationError: + pass + + if json_encoder is None: + try: validate(json_data, 'qmk.keyboard.v1') json_encoder = InfoJSONEncoder except ValidationError as e: |