Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Improve LAYOUT macro searching (#9530)

Browse source 
* Improve LAYOUT macro searching

* Apply suggestions from code review

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>

* Adjust signature

* Try to copy the makefile's handling of DEFAULT_FOLDER

* Move it further up, into `info_json()`

* Move it even further up so that keyboard_folder is correct

* Update lib/python/qmk/info.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

* Update lib/python/qmk/info.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@drpepper.org>
This commit is contained in:
Ryan 2020-10-07 10:57:40 +11:00 committed by GitHub
parent 2c9ffd4739
commit c9a06965c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,12 +9,19 @@ from milc import cli
from qmk.constants import ARM_PROCESSORS, AVR_PROCESSORS, VUSB_PROCESSORS from qmk.constants import ARM_PROCESSORS, AVR_PROCESSORS, VUSB_PROCESSORS
from qmk.c_parse import find_layouts from qmk.c_parse import find_layouts
from qmk.keyboard import config_h, rules_mk from qmk.keyboard import config_h, rules_mk
from qmk.makefile import parse_rules_mk_file
from qmk.math import compute from qmk.math import compute
def info_json(keyboard): def info_json(keyboard):
"""Generate the info.json data for a specific keyboard. """Generate the info.json data for a specific keyboard.
""" """
cur_dir = Path('keyboards')
rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
if 'DEFAULT_FOLDER' in rules:
keyboard = rules['DEFAULT_FOLDER']
rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk', rules)
info_data = { info_data = {
'keyboard_name': str(keyboard), 'keyboard_name': str(keyboard),
'keyboard_folder': str(keyboard), 'keyboard_folder': str(keyboard),
@ -22,7 +29,7 @@ def info_json(keyboard):
'maintainer': 'qmk', 'maintainer': 'qmk',
} }
for layout_name, layout_json in _find_all_layouts(keyboard).items(): for layout_name, layout_json in _find_all_layouts(keyboard, rules).items():
if not layout_name.startswith('LAYOUT_kc'): if not layout_name.startswith('LAYOUT_kc'):
info_data['layouts'][layout_name] = layout_json info_data['layouts'][layout_name] = layout_json
@ -99,22 +106,24 @@ def _extract_rules_mk(info_data):
return info_data return info_data
def _find_all_layouts(keyboard): def _search_keyboard_h(path):
"""Looks for layout macros associated with this keyboard.
"""
layouts = {}
rules = rules_mk(keyboard)
keyboard_path = Path(rules.get('DEFAULT_FOLDER', keyboard))
# Pull in all layouts defined in the standard files
current_path = Path('keyboards/') current_path = Path('keyboards/')
for directory in keyboard_path.parts: layouts = {}
for directory in path.parts:
current_path = current_path / directory current_path = current_path / directory
keyboard_h = '%s.h' % (directory,) keyboard_h = '%s.h' % (directory,)
keyboard_h_path = current_path / keyboard_h keyboard_h_path = current_path / keyboard_h
if keyboard_h_path.exists(): if keyboard_h_path.exists():
layouts.update(find_layouts(keyboard_h_path)) layouts.update(find_layouts(keyboard_h_path))
return layouts
def _find_all_layouts(keyboard, rules):
"""Looks for layout macros associated with this keyboard.
"""
layouts = _search_keyboard_h(Path(keyboard))
if not layouts: if not layouts:
# If we didn't find any layouts above we widen our search. This is error # If we didn't find any layouts above we widen our search. This is error
# prone which is why we want to encourage people to follow the standard above. # prone which is why we want to encourage people to follow the standard above.