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

use layout aliases when processing info.json (#12333)

Browse source
This commit is contained in:
Zach White 2021-03-22 18:58:07 -07:00 committed by GitHub
parent c5b0366a25
commit e1a7027fe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/python/qmk/info.py
View file

@ -549,7 +549,15 @@ def merge_info_jsons(keyboard, info_data):
continue continue
# Merge layout data in # Merge layout data in
if 'layout_aliases' in new_info_data:
info_data['layout_aliases'] = {**info_data.get('layout_aliases', {}), **new_info_data['layout_aliases']}
del new_info_data['layout_aliases']
for layout_name, layout in new_info_data.get('layouts', {}).items(): for layout_name, layout in new_info_data.get('layouts', {}).items():
if layout_name in info_data.get('layout_aliases', {}):
_log_warning(info_data, f"info.json uses alias name {layout_name} instead of {info_data['layout_aliases'][layout_name]}")
layout_name = info_data['layout_aliases'][layout_name]
if layout_name in info_data['layouts']: if layout_name in info_data['layouts']:
for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']):
existing_key.update(new_key) existing_key.update(new_key)
@ -559,7 +567,7 @@ def merge_info_jsons(keyboard, info_data):
# Update info_data with the new data # Update info_data with the new data
if 'layouts' in new_info_data: if 'layouts' in new_info_data:
del (new_info_data['layouts']) del new_info_data['layouts']
deep_update(info_data, new_info_data) deep_update(info_data, new_info_data)