drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Allow flash/compile to accept relative json paths (#11767)

Browse source 
* Allow flash/compile to accept relative paths

* Review suggestions

* Review comments

* Put back exists check otherwise stdin fails

* fix lint
This commit is contained in:
Joel Challis 2021-02-07 21:02:51 +00:00 • committed by GitHub
parent fc29c7a589
commit ccc9c43161
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/python/qmk/cli/json2c.py
View file

@ -1,7 +1,6 @@
"""Generate a keymap.c from a configurator export.
"""
import json
import sys
from milc import cli
@ -11,7 +10,7 @@ import qmk.path
@cli.argument('-o', '--output', arg_only=True, type=qmk.path.normpath, help='File to write to')
@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
@cli.argument('filename', type=qmk.path.normpath, arg_only=True, help='Configurator JSON file')
@cli.argument('filename', type=qmk.path.FileType('r'), arg_only=True, help='Configurator JSON file')
@cli.subcommand('Creates a keymap.c from a QMK Configurator export.')
def json2c(cli):
"""Generate a keymap.c from a configurator export.
@ -20,19 +19,8 @@ def json2c(cli):
"""
try:
# Parse the configurator from stdin
if cli.args.filename and cli.args.filename.name == '-':
user_keymap = json.load(sys.stdin)
else:
# Error checking
if not cli.args.filename.exists():
cli.log.error('JSON file does not exist!')
return False
# Parse the configurator json file
else:
user_keymap = json.loads(cli.args.filename.read_text())
# Parse the configurator from json file (or stdin)
user_keymap = json.load(cli.args.filename)
except json.decoder.JSONDecodeError as ex:
cli.log.error('The JSON input does not appear to be valid.')