From e46cc2db8c4668b05ed873f57a54785ed56e2415 Mon Sep 17 00:00:00 2001
From: Erovia <erovia@users.noreply.github.com>
Date: Thu, 10 Oct 2019 22:58:52 +0200
Subject: [PATCH] Try to figure out revision, drop -rv/--revision argument
---
lib/python/qmk/cli/list/keymaps.py | 66 +++++++++++++++---------------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/lib/python/qmk/cli/list/keymaps.py b/lib/python/qmk/cli/list/keymaps.py
index 6cb21593f4..f3a1f2a50f 100644
--- a/lib/python/qmk/cli/list/keymaps.py
+++ b/lib/python/qmk/cli/list/keymaps.py
@@ -26,61 +26,63 @@ def unicode_lines(filename):
def parse_rules_mk(keyboard, revision = ""):
base_path = os.path.join(os.getcwd(), "keyboards", keyboard) + os.path.sep
- rules_mk_path_wildcard = os.path.join(base_path, "**", "rules.mk")
- rules_mk_regex = re.compile(r"^" + base_path + "(?:" + revision + os.path.sep + ")?rules.mk")
- paths = [path for path in glob.iglob(rules_mk_path_wildcard, recursive = True) if rules_mk_regex.search(path)]
-
rules_mk = dict()
- config_regex = re.compile(r"^\s*(\S+)\s*=\s*((?:\s*\S+)+)")
- for file_path in paths:
- rules_mk_content = unicode_lines(file_path)
- parsed_file = dict()
- for line in rules_mk_content:
- found = config_regex.search(line)
- if found:
- parsed_file[found.group(1)] = found.group(2)
- version = file_path.replace(base_path, "").replace(os.path.sep, "").replace("rules.mk", "")
- rules_mk[version if version else "base"] = parsed_file
+ if os.path.exists(base_path + os.path.sep + revision):
+ rules_mk_path_wildcard = os.path.join(base_path, "**", "rules.mk")
+ rules_mk_regex = re.compile(r"^" + base_path + "(?:" + revision + os.path.sep + ")?rules.mk")
+ paths = [path for path in glob.iglob(rules_mk_path_wildcard, recursive = True) if rules_mk_regex.search(path)]
+
+ config_regex = re.compile(r"^\s*(\S+)\s*=\s*((?:\s*\S+)+)")
+ for file_path in paths:
+ rules_mk_content = unicode_lines(file_path)
+ parsed_file = dict()
+ for line in rules_mk_content:
+ found = config_regex.search(line)
+ if found:
+ parsed_file[found.group(1)] = found.group(2)
+ version = file_path.replace(base_path, "").replace(os.path.sep, "").replace("rules.mk", "")
+ rules_mk[version if version else "base"] = parsed_file
return rules_mk
def find_keymaps(base_path, revision = "", community = False):
path_wildcard = os.path.join(base_path, "**", "keymap.c")
if community:
path_regex = re.compile(r"^" + re.escape(base_path) + "(\S+)" + os.path.sep + "keymap\.c")
- names = [revision + os.path.sep + path_regex.sub(lambda name: name.group(1), path) for path in glob.iglob(path_wildcard, recursive = True)]
else:
path_regex = re.compile(r"^" + re.escape(base_path) + "(?:" + re.escape(revision) + os.path.sep + ")?keymaps" + os.path.sep + "(\S+)" + os.path.sep + "keymap\.c")
- names = [revision + os.path.sep + path_regex.sub(lambda name: name.group(1), path) if revision else path_regex.sub(lambda name: name.group(1), path) for path in glob.iglob(path_wildcard, recursive = True) if path_regex.search(path)]
+ names = [path_regex.sub(lambda name: name.group(1), path) for path in glob.iglob(path_wildcard, recursive = True) if path_regex.search(path)]
return names
@cli.argument("-kb", "--keyboard", help="Specify keyboard name. Example: 1upkeyboards/1up60hse")
-@cli.argument("-rv", "--revision", help="Specify the revison name. Example: rev6")
@cli.subcommand("List the keymaps for a specific keyboard")
def list_keymaps(cli):
"""List the keymaps for a specific keyboard
"""
# ask for user input if keyboard was not provided in the command line
- keyboard = cli.config.list_keymaps.keyboard if cli.config.list_keymaps.keyboard else input("Keyboard Name: ")
- revision = cli.config.list_keymaps.revision if cli.config.list_keymaps.revision else ""
+ keyboard_name = cli.config.list_keymaps.keyboard if cli.config.list_keymaps.keyboard else input("Keyboard Name: ")
+ if os.path.sep in keyboard_name:
+ keyboard, revision = os.path.split(os.path.normpath(keyboard_name))
+ else:
+ keyboard = keyboard_name
+ revision = ""
# get all the rules.mk files for the keyboard
rules_mk = parse_rules_mk(keyboard, revision)
+ names = list()
- if "base" in rules_mk or revision:
- keyboard_name = keyboard + os.path.sep + revision
- kb_base_path = os.path.join(os.getcwd(), "keyboards", keyboard) + os.path.sep
- names = find_keymaps(kb_base_path, revision)
- else:
- names = list()
+ if rules_mk:
+ if "base" in rules_mk or revision:
+ kb_base_path = os.path.join(os.getcwd(), "keyboards", keyboard) + os.path.sep
+ names = find_keymaps(kb_base_path, revision)
- for rev, data in rules_mk.items():
- if "LAYOUTS" in data:
- for layout in data["LAYOUTS"].split():
- cl_base_path = os.path.join(os.getcwd(), "layouts", "community", layout) + os.path.sep
- names = names + find_keymaps(cl_base_path, rev, community = True)
+ for rev, data in rules_mk.items():
+ if "LAYOUTS" in data:
+ for layout in data["LAYOUTS"].split():
+ cl_base_path = os.path.join(os.getcwd(), "layouts", "community", layout) + os.path.sep
+ names = names + find_keymaps(cl_base_path, rev, community = True)
- names.sort()
+ names.sort()
for name in names:
# We echo instead of cli.log.info to allow easier piping of this output
- cli.echo(keyboard + os.path.sep + name)
+ cli.echo(keyboard_name + os.path.sep + name)