add support for fetching KLE over http
This commit is contained in:
parent
2040fe3d8a
commit
63472dfde7
2 changed files with 53 additions and 4 deletions
|
@ -4,6 +4,7 @@ import json
|
|||
import os
|
||||
from pathlib import Path
|
||||
|
||||
import requests
|
||||
from milc import cli
|
||||
from kle2xy import KLE2xy
|
||||
|
||||
|
@ -14,6 +15,51 @@ from qmk.info import info_json
|
|||
from qmk.info_json_encoder import InfoJSONEncoder
|
||||
|
||||
|
||||
def fetch_json(url):
|
||||
"""Gets the JSON from a url.
|
||||
"""
|
||||
response = fetch_url(url)
|
||||
|
||||
if response.status_code == 200:
|
||||
return response.json()
|
||||
|
||||
print(f'ERROR: {url} returned {response.status_code}: {response.text}')
|
||||
return {}
|
||||
|
||||
|
||||
def fetch_url(url):
|
||||
"""Fetch a URL.
|
||||
"""
|
||||
response = requests.get(url, timeout=30)
|
||||
response.encoding='utf-8-sig'
|
||||
|
||||
return response
|
||||
|
||||
|
||||
def fetch_gist(id):
|
||||
"""Retrieve a gist from gist.github.com
|
||||
"""
|
||||
url = f'https://api.github.com/gists/{id}'
|
||||
gist = fetch_json(url)
|
||||
|
||||
for data in gist['files'].values():
|
||||
if data['filename'].endswith('kbd.json'):
|
||||
if data.get('truncated'):
|
||||
return fetch_url(data['raw_url']).text
|
||||
else:
|
||||
return data['content']
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def fetch_kle(id):
|
||||
"""Fetch the kle data from a gist ID.
|
||||
"""
|
||||
gist = fetch_gist(id)
|
||||
|
||||
return gist[1:-1]
|
||||
|
||||
|
||||
@cli.argument('kle', arg_only=True, help='A file or KLE id to convert')
|
||||
@cli.argument('--vid', arg_only=True, default='0x03A8', help='USB VID (Default: 0x03A8)')
|
||||
@cli.argument('--pid', arg_only=True, default='0x0000', help='USB PID (Default: 0x0000)')
|
||||
|
@ -39,9 +85,11 @@ def kle2json(cli):
|
|||
cli.log.error('Invalid KLE url: {fg_cyan}%s', cli.args.kle)
|
||||
return False
|
||||
else:
|
||||
print('FIXME: fetch gist')
|
||||
return False
|
||||
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
|
||||
|
||||
|
|
|
@ -5,3 +5,4 @@ colorama
|
|||
hjson
|
||||
milc
|
||||
pygments
|
||||
requests
|
||||
|
|
Loading…
Reference in a new issue