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

This commit is contained in:
Nick Brassel
2023-11-22 13:27:44 +11:00
11 changed files with 76 additions and 19 deletions
+6 -1
View File
@@ -72,6 +72,11 @@ class AllKeyboards:
base_path = os.path.join(os.getcwd(), "keyboards") + os.path.sep
@lru_cache(maxsize=1)
def keyboard_alias_definitions():
return json_load(Path('data/mappings/keyboard_aliases.hjson'))
def is_all_keyboards(keyboard):
"""Returns True if the keyboard is an AllKeyboards object.
"""
@@ -114,7 +119,7 @@ def keyboard_folder(keyboard):
This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
"""
aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
aliases = keyboard_alias_definitions()
while keyboard in aliases:
last_keyboard = keyboard