1
0
Fork 0

CLI: fix json2c subcommand and add/fix tests (#9206)

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
This commit is contained in:
Erovia 2020-05-26 17:43:33 +02:00 committed by GitHub
parent af2ca13604
commit 6501377070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 9 deletions

View file

@ -18,19 +18,19 @@ def json2c(cli):
This command uses the `qmk.keymap` module to generate a keymap.c from a configurator export. The generated keymap is written to stdout, or to a file if -o is provided.
"""
# Error checking
if not cli.args.filename.exists():
cli.log.error('JSON file does not exist!')
cli.print_usage()
exit(1)
if cli.args.filename.name == '-':
if cli.args.filename and cli.args.filename.name == '-':
# TODO(skullydazed/anyone): Read file contents from STDIN
cli.log.error('Reading from STDIN is not (yet) supported.')
cli.print_usage()
exit(1)
if not cli.args.filename.exists():
cli.log.error('JSON file does not exist!')
cli.print_usage()
exit(1)
# Environment processing
if cli.args.output.name == ('-'):
if cli.args.output and cli.args.output.name == '-':
cli.args.output = None
# Parse the configurator json