Add cli convert subcommand, from raw KLE to JSON (#6898)
* Add initial pass at KLE convert * Add cli log on convert * Move kle2xy, add absolute filepath arg support * Add overwrite flag, and context sensitive conversion * Update docs/cli.md * Fix converter.py typo * Add convert unit test * Rename to kle2qmk * Rename subcommand * Rename subcommand to kle2json * Change tests to cover rename * Rename in __init__.py * Update CLI docs with new subcommand name * Fix from suggestions in PR #6898 * Help with cases of case sensitivity * Update cli.md * Use angle brackets to indicate required option * Make the output text more accurate
This commit is contained in:
		@@ -10,6 +10,7 @@ from . import doctor
 | 
			
		||||
from . import hello
 | 
			
		||||
from . import json
 | 
			
		||||
from . import list
 | 
			
		||||
from . import kle2json
 | 
			
		||||
from . import new
 | 
			
		||||
from . import pyformat
 | 
			
		||||
from . import pytest
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										79
									
								
								lib/python/qmk/cli/kle2json.py
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										79
									
								
								lib/python/qmk/cli/kle2json.py
									
									
									
									
									
										Executable file
									
								
							@@ -0,0 +1,79 @@
 | 
			
		||||
"""Convert raw KLE to JSON
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
import json
 | 
			
		||||
import os
 | 
			
		||||
from pathlib import Path
 | 
			
		||||
from argparse import FileType
 | 
			
		||||
from decimal import Decimal
 | 
			
		||||
from collections import OrderedDict
 | 
			
		||||
 | 
			
		||||
from milc import cli
 | 
			
		||||
from kle2xy import KLE2xy
 | 
			
		||||
 | 
			
		||||
from qmk.converter import kle2qmk
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class CustomJSONEncoder(json.JSONEncoder):
 | 
			
		||||
    def default(self, obj):
 | 
			
		||||
        try:
 | 
			
		||||
            if isinstance(obj, Decimal):
 | 
			
		||||
                if obj % 2 in (Decimal(0), Decimal(1)):
 | 
			
		||||
                    return int(obj)
 | 
			
		||||
                return float(obj)
 | 
			
		||||
        except TypeError:
 | 
			
		||||
            pass
 | 
			
		||||
        return JSONEncoder.default(self, obj)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@cli.argument('filename', help='The KLE raw txt to convert')
 | 
			
		||||
@cli.argument('-f', '--force', action='store_true', help='Flag to overwrite current info.json')
 | 
			
		||||
@cli.subcommand('Convert a KLE layout to a Configurator JSON')
 | 
			
		||||
def kle2json(cli):
 | 
			
		||||
    """Convert a KLE layout to QMK's layout format.
 | 
			
		||||
    """        # If filename is a path
 | 
			
		||||
    if cli.args.filename.startswith("/") or cli.args.filename.startswith("./"):
 | 
			
		||||
        file_path = Path(cli.args.filename)
 | 
			
		||||
    # Otherwise assume it is a file name
 | 
			
		||||
    else:
 | 
			
		||||
        file_path = Path(os.environ['ORIG_CWD'], cli.args.filename)
 | 
			
		||||
    # Check for valid file_path for more graceful failure
 | 
			
		||||
    if not file_path.exists():
 | 
			
		||||
        return cli.log.error('File {fg_cyan}%s{style_reset_all} was not found.', str(file_path))
 | 
			
		||||
    out_path = file_path.parent
 | 
			
		||||
    raw_code = file_path.open().read()
 | 
			
		||||
    # Check if info.json exists, allow overwrite with force
 | 
			
		||||
    if Path(out_path, "info.json").exists() and not cli.args.force:
 | 
			
		||||
        cli.log.error('File {fg_cyan}%s/info.json{style_reset_all} already exists, use -f or --force to overwrite.', str(out_path))
 | 
			
		||||
        return False;
 | 
			
		||||
    try:
 | 
			
		||||
        # Convert KLE raw to x/y coordinates (using kle2xy package from skullydazed)
 | 
			
		||||
        kle = KLE2xy(raw_code)
 | 
			
		||||
    except Exception as e:
 | 
			
		||||
        cli.log.error('Could not parse KLE raw data: %s', raw_code)
 | 
			
		||||
        cli.log.exception(e)
 | 
			
		||||
        # FIXME: This should be better
 | 
			
		||||
        return cli.log.error('Could not parse KLE raw data.')
 | 
			
		||||
    keyboard = OrderedDict(
 | 
			
		||||
        keyboard_name=kle.name,
 | 
			
		||||
        url='',
 | 
			
		||||
        maintainer='qmk',
 | 
			
		||||
        width=kle.columns,
 | 
			
		||||
        height=kle.rows,
 | 
			
		||||
        layouts={'LAYOUT': {
 | 
			
		||||
            'layout': 'LAYOUT_JSON_HERE'
 | 
			
		||||
        }},
 | 
			
		||||
    )
 | 
			
		||||
    # Initialize keyboard with json encoded from ordered dict
 | 
			
		||||
    keyboard = json.dumps(keyboard, indent=4, separators=(
 | 
			
		||||
        ', ', ': '), sort_keys=False, cls=CustomJSONEncoder)
 | 
			
		||||
    # Initialize layout with kle2qmk from converter module
 | 
			
		||||
    layout = json.dumps(kle2qmk(kle), separators=(
 | 
			
		||||
        ', ', ':'), cls=CustomJSONEncoder)
 | 
			
		||||
    # Replace layout in keyboard json
 | 
			
		||||
    keyboard = keyboard.replace('"LAYOUT_JSON_HERE"', layout)
 | 
			
		||||
    # Write our info.json
 | 
			
		||||
    file = open(str(out_path) + "/info.json", "w")
 | 
			
		||||
    file.write(keyboard)
 | 
			
		||||
    file.close()
 | 
			
		||||
    cli.log.info('Wrote out {fg_cyan}%s/info.json', str(out_path))
 | 
			
		||||
		Reference in New Issue
	
	Block a user