Browse Source

Merge remote-tracking branch 'origin/develop' into xap

QMK Bot 3 years ago
parent
commit
5406b499f2
2 changed files with 5 additions and 1 deletions
  1. 4 0
      lib/python/qmk/cli/find.py
  2. 1 1
      lib/python/qmk/search.py

+ 4 - 0
lib/python/qmk/cli/find.py

@@ -19,6 +19,10 @@ from qmk.search import search_keymap_targets
 def find(cli):
     """Search through all keyboards and keymaps for a given search criteria.
     """
+
+    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}')

+ 1 - 1
lib/python/qmk/search.py

@@ -61,7 +61,7 @@ def search_keymap_targets(keymap='default', filters=[], print_vals=[]):
             target_list = [(kb, keymap) for kb in filter(lambda kb: kb is not None, pool.starmap(_keymap_exists, [(kb, keymap) for kb in qmk.keyboard.list_keyboards()]))]
 
         if len(filters) == 0:
-            targets = target_list
+            targets = [(kb, km, {}) for kb, km in target_list]
         else:
             cli.log.info('Parsing data for all matching keyboard/keymap combinations...')
             valid_keymaps = [(e[0], e[1], dotty(e[2])) for e in pool.starmap(_load_keymap_info, target_list)]