ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rearrange to more reliably detect urls

Browse source
This commit is contained in:
Zach White 2021-01-07 20:42:37 -08:00
parent 7f398eea50
commit 0177fbd65b
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/python/qmk/cli/kle2json.py
View file

@ -70,23 +70,22 @@ def kle2json(cli):
file_path = Path(os.environ['ORIG_CWD'], cli.args.kle) file_path = Path(os.environ['ORIG_CWD'], cli.args.kle)
# Find our KLE text # Find our KLE text
if file_path.exists(): if cli.args.kle.startswith('http') and '#' in cli.args.kle:
kle_path = cli.args.kle.split('#', 1)[1]
if 'gists' not in kle_path:
cli.log.error('Invalid KLE url: {fg_cyan}%s', cli.args.kle)
return False
else:
raw_code = fetch_kle(kle_path.split('/')[-1])
elif file_path.exists():
raw_code = file_path.open().read() raw_code = file_path.open().read()
else: else:
if cli.args.kle.startswith('http') and '#' in cli.args.kle: raw_code = fetch_kle(cli.args.kle)
kle_path = cli.args.kle.split('#', 1)[1] if not raw_code:
if 'gists' not in kle_path: cli.log.error('File {fg_cyan}%s{style_reset_all} was not found.', file_path)
cli.log.error('Invalid KLE url: {fg_cyan}%s', cli.args.kle) return False
return False
else:
raw_code = fetch_kle(kle_path.split('/')[-1])
else:
raw_code = fetch_kle(cli.args.kle)
if not raw_code:
cli.log.error('File {fg_cyan}%s{style_reset_all} was not found.', file_path)
return False
# Make sure the user supplied a keyboard # Make sure the user supplied a keyboard
if not cli.args.keyboard: if not cli.args.keyboard: