|
@@ -1,13 +1,12 @@
|
|
|
"""Helpful decorators that subcommands can use.
|
|
|
"""
|
|
|
import functools
|
|
|
-from pathlib import Path
|
|
|
from time import monotonic
|
|
|
|
|
|
from milc import cli
|
|
|
|
|
|
-from qmk.keymap import is_keymap_dir
|
|
|
-from qmk.path import is_keyboard, under_qmk_firmware
|
|
|
+from qmk.keyboard import find_keyboard_from_dir
|
|
|
+from qmk.keymap import find_keymap_from_dir
|
|
|
|
|
|
|
|
|
def automagic_keyboard(func):
|
|
@@ -17,27 +16,13 @@ def automagic_keyboard(func):
|
|
|
"""
|
|
|
@functools.wraps(func)
|
|
|
def wrapper(*args, **kwargs):
|
|
|
- # Check to make sure their copy of MILC supports config_source
|
|
|
- if not hasattr(cli, 'config_source'):
|
|
|
- cli.log.error("This subcommand requires a newer version of the QMK CLI. Please upgrade using `pip3 install --upgrade qmk` or your package manager.")
|
|
|
- exit(1)
|
|
|
-
|
|
|
# Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards`
|
|
|
if cli.config_source[cli._entrypoint.__name__]['keyboard'] != 'argument':
|
|
|
- relative_cwd = under_qmk_firmware()
|
|
|
-
|
|
|
- if relative_cwd and len(relative_cwd.parts) > 1 and relative_cwd.parts[0] == 'keyboards':
|
|
|
- # Attempt to extract the keyboard name from the current directory
|
|
|
- current_path = Path('/'.join(relative_cwd.parts[1:]))
|
|
|
-
|
|
|
- if 'keymaps' in current_path.parts:
|
|
|
- # Strip current_path of anything after `keymaps`
|
|
|
- keymap_index = len(current_path.parts) - current_path.parts.index('keymaps') - 1
|
|
|
- current_path = current_path.parents[keymap_index]
|
|
|
+ keyboard = find_keyboard_from_dir()
|
|
|
|
|
|
- if is_keyboard(current_path):
|
|
|
- cli.config[cli._entrypoint.__name__]['keyboard'] = str(current_path)
|
|
|
- cli.config_source[cli._entrypoint.__name__]['keyboard'] = 'keyboard_directory'
|
|
|
+ if keyboard:
|
|
|
+ cli.config[cli._entrypoint.__name__]['keyboard'] = keyboard
|
|
|
+ cli.config_source[cli._entrypoint.__name__]['keyboard'] = 'keyboard_directory'
|
|
|
|
|
|
return func(*args, **kwargs)
|
|
|
|
|
@@ -51,36 +36,13 @@ def automagic_keymap(func):
|
|
|
"""
|
|
|
@functools.wraps(func)
|
|
|
def wrapper(*args, **kwargs):
|
|
|
- # Check to make sure their copy of MILC supports config_source
|
|
|
- if not hasattr(cli, 'config_source'):
|
|
|
- cli.log.error("This subcommand requires a newer version of the QMK CLI. Please upgrade using `pip3 install --upgrade qmk` or your package manager.")
|
|
|
- exit(1)
|
|
|
-
|
|
|
# Ensure that `--keymap` was not passed and that we're under `qmk_firmware`
|
|
|
if cli.config_source[cli._entrypoint.__name__]['keymap'] != 'argument':
|
|
|
- relative_cwd = under_qmk_firmware()
|
|
|
-
|
|
|
- if relative_cwd and len(relative_cwd.parts) > 1:
|
|
|
- # If we're in `qmk_firmware/keyboards` and `keymaps` is in our path, try to find the keyboard name.
|
|
|
- if relative_cwd.parts[0] == 'keyboards' and 'keymaps' in relative_cwd.parts:
|
|
|
- current_path = Path('/'.join(relative_cwd.parts[1:])) # Strip 'keyboards' from the front
|
|
|
-
|
|
|
- if 'keymaps' in current_path.parts and current_path.name != 'keymaps':
|
|
|
- while current_path.parent.name != 'keymaps':
|
|
|
- current_path = current_path.parent
|
|
|
- cli.config[cli._entrypoint.__name__]['keymap'] = current_path.name
|
|
|
- cli.config_source[cli._entrypoint.__name__]['keymap'] = 'keymap_directory'
|
|
|
-
|
|
|
- # If we're in `qmk_firmware/layouts` guess the name from the community keymap they're in
|
|
|
- elif relative_cwd.parts[0] == 'layouts' and is_keymap_dir(relative_cwd):
|
|
|
- cli.config[cli._entrypoint.__name__]['keymap'] = relative_cwd.name
|
|
|
- cli.config_source[cli._entrypoint.__name__]['keymap'] = 'layouts_directory'
|
|
|
-
|
|
|
- # If we're in `qmk_firmware/users` guess the name from the userspace they're in
|
|
|
- elif relative_cwd.parts[0] == 'users':
|
|
|
- # Guess the keymap name based on which userspace they're in
|
|
|
- cli.config[cli._entrypoint.__name__]['keymap'] = relative_cwd.parts[1]
|
|
|
- cli.config_source[cli._entrypoint.__name__]['keymap'] = 'users_directory'
|
|
|
+ keymap_name, keymap_type = find_keymap_from_dir()
|
|
|
+
|
|
|
+ if keymap_name:
|
|
|
+ cli.config[cli._entrypoint.__name__]['keymap'] = keymap_name
|
|
|
+ cli.config_source[cli._entrypoint.__name__]['keymap'] = keymap_type
|
|
|
|
|
|
return func(*args, **kwargs)
|
|
|
|