Change keyboard json format to bring it inline with the current api (#11231)
This commit is contained in:
parent
5619b1d3db
commit
624cafbfd2
|
@ -36,7 +36,7 @@ def generate_api(cli):
|
|||
keyboard_readme_src = Path('keyboards') / keyboard_name / 'readme.md'
|
||||
|
||||
keyboard_dir.mkdir(parents=True, exist_ok=True)
|
||||
keyboard_info.write_text(json.dumps(kb_all['keyboards'][keyboard_name]))
|
||||
keyboard_info.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': {keyboard_name: kb_all['keyboards'][keyboard_name]}}))
|
||||
|
||||
if keyboard_readme_src.exists():
|
||||
copyfile(keyboard_readme_src, keyboard_readme)
|
||||
|
|
|
@ -230,11 +230,15 @@ def merge_info_jsons(keyboard, info_data):
|
|||
"""
|
||||
for info_file in find_info_json(keyboard):
|
||||
# Load and validate the JSON data
|
||||
with info_file.open('r') as info_fd:
|
||||
new_info_data = json.load(info_fd)
|
||||
try:
|
||||
with info_file.open('r') as info_fd:
|
||||
new_info_data = json.load(info_fd)
|
||||
except Exception as e:
|
||||
_log_error(info_data, "Invalid JSON in file %s: %s: %s" % (str(info_file), e.__class__.__name__, e))
|
||||
continue
|
||||
|
||||
if not isinstance(new_info_data, dict):
|
||||
_log_error(info_data, "Invalid file %s, root object should be a dictionary.", str(info_file))
|
||||
_log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))
|
||||
continue
|
||||
|
||||
# Copy whitelisted keys into `info_data`
|
||||
|
|
Loading…
Reference in New Issue