summaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli
diff options
context:
space:
mode:
authorLongerHV <46924944+LongerHV@users.noreply.github.com>2020-12-29 20:34:48 +0100
committerGitHub <noreply@github.com>2020-12-29 11:34:48 -0800
commit221d8fd8669ff528bfedd01f41486f5298d960e1 (patch)
treec82fe3f0e032ce2057039b4baadbb1f91c0608ed /lib/python/qmk/cli
parent3300164065949e6bc9423632ccbcd0022be8074d (diff)
[CLI] Add stdin support for json2c command (#11289)
* Implement stdin for json2c command * Refactor * Handle json decode error * Add stdin support for c2json cli command * Refactor to prevent code duplication * Change exit(1) to return False in c2json command * Remove unused import
Diffstat (limited to 'lib/python/qmk/cli')
-rw-r--r--lib/python/qmk/cli/c2json.py22
-rwxr-xr-xlib/python/qmk/cli/json2c.py32
2 files changed, 27 insertions, 27 deletions
diff --git a/lib/python/qmk/cli/c2json.py b/lib/python/qmk/cli/c2json.py
index 8c8bd1f57e..2b3bb774f7 100644
--- a/lib/python/qmk/cli/c2json.py
+++ b/lib/python/qmk/cli/c2json.py
@@ -1,7 +1,6 @@
"""Generate a keymap.json from a keymap.c file.
"""
import json
-import sys
from milc import cli
@@ -21,19 +20,14 @@ def c2json(cli):
This command uses the `qmk.keymap` module to generate a keymap.json from a keymap.c file. The generated keymap is written to stdout, or to a file if -o is provided.
"""
- cli.args.filename = qmk.path.normpath(cli.args.filename)
+ if cli.args.filename != '-':
+ cli.args.filename = qmk.path.normpath(cli.args.filename)
- # Error checking
- if not cli.args.filename.exists():
- cli.log.error('C file does not exist!')
- cli.print_usage()
- exit(1)
-
- if str(cli.args.filename) == '-':
- # TODO(skullydazed/anyone): Read file contents from STDIN
- cli.log.error('Reading from STDIN is not (yet) supported.')
- cli.print_usage()
- exit(1)
+ # Error checking
+ if not cli.args.filename.exists():
+ cli.log.error('C file does not exist!')
+ cli.print_usage()
+ return False
# Environment processing
if cli.args.output == ('-'):
@@ -47,7 +41,7 @@ def c2json(cli):
keymap_json = qmk.keymap.generate_json(keymap_json['keymap'], keymap_json['keyboard'], keymap_json['layout'], keymap_json['layers'])
except KeyError:
cli.log.error('Something went wrong. Try to use --no-cpp.')
- sys.exit(1)
+ return False
if cli.args.output:
cli.args.output.parent.mkdir(parents=True, exist_ok=True)
diff --git a/lib/python/qmk/cli/json2c.py b/lib/python/qmk/cli/json2c.py
index 426078063c..97d8fb0c33 100755
--- a/lib/python/qmk/cli/json2c.py
+++ b/lib/python/qmk/cli/json2c.py
@@ -1,6 +1,7 @@
"""Generate a keymap.c from a configurator export.
"""
import json
+import sys
from milc import cli
@@ -17,26 +18,31 @@ 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 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()
- return False
- if not cli.args.filename.exists():
- cli.log.error('JSON file does not exist!')
- cli.print_usage()
+ 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())
+
+ except json.decoder.JSONDecodeError as ex:
+ cli.log.error('The JSON input does not appear to be valid.')
+ cli.log.error(ex)
return False
# Environment processing
if cli.args.output and cli.args.output.name == '-':
cli.args.output = None
- # Parse the configurator json
- with cli.args.filename.open('r') as fd:
- user_keymap = json.load(fd)
-
# Generate the keymap
keymap_c = qmk.keymap.generate_c(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers'])