Merge branch 'develop'

1 files changed, 12 insertions, 4 deletions

diff --git a/lib/python/qmk/cli/find.py b/lib/python/qmk/cli/find.py
index b6f74380ab..2836eb8a54 100644
--- a/lib/python/qmk/cli/find.py
+++ b/lib/python/qmk/cli/find.py
@@ -11,13 +11,21 @@ from qmk.search import search_keymap_targets
     action='append',
     default=[],
     help=  # noqa: `format-python` and `pytest` don't agree here.
-    "Filter the list of keyboards based on the supplied value in rules.mk. Matches info.json structure, and accepts the formats 'features.rgblight=true' or 'exists(matrix_pins.direct)'. May be passed multiple times, all filters need to match. Value may include wildcards such as '*' and '?'."  # noqa: `format-python` and `pytest` don't agree here.
+    "Filter the list of keyboards based on their info.json data. Accepts the formats key=value, function(key), or function(key,value), eg. 'features.rgblight=true'. Valid functions are 'absent', 'contains', 'exists' and 'length'. May be passed multiple times; all filters need to match. Value may include wildcards such as '*' and '?'."  # noqa: `format-python` and `pytest` don't agree here.
 )
+@cli.argument('-p', '--print', arg_only=True, action='append', default=[], help="For each matched target, print the value of the supplied info.json key. May be passed multiple times.")
 @cli.argument('-km', '--keymap', type=str, default='default', help="The keymap name to build. Default is 'default'.")
 @cli.subcommand('Find builds which match supplied search criteria.')
 def find(cli):
     """Search through all keyboards and keymaps for a given search criteria.
     """
-    targets = search_keymap_targets(cli.args.keymap, cli.args.filter)
-    for target in targets:
-        print(f'{target[0]}:{target[1]}')
+
+    if len(cli.args.filter) == 0 and len(cli.args.print) > 0:
+        cli.log.warning('No filters supplied -- keymaps not parsed, unable to print requested values.')
+
+    targets = search_keymap_targets(cli.args.keymap, cli.args.filter, cli.args.print)
+    for keyboard, keymap, print_vals in targets:
+        print(f'{keyboard}:{keymap}')
+
+        for key, val in print_vals:
+            print(f'    {key}={val}')