feat: add ability use local info.json file (#9)

Author: PikaThonk

internal/lib/generate.go

@@ -64,13 +64,15 @@ func drawLayout(ctx *gg.Context, transparent bool, layout keyboard.Layout) error
 	for _, key := range layout.Layout {
 		x := key.X*keySize + spacer*key.X + spacer
 		y := key.Y*keySize + spacer*key.Y + (fontSize + spacer*2)
-
+		w := keySize
+		h := keySize
 		if key.H != nil {
-			ctx.DrawRoundedRectangle(x, y, key.W*keySize, *key.H*keySize, spacer)
-		} else {
-			ctx.DrawRoundedRectangle(x, y, key.W*keySize, keySize, spacer)
+			h = *key.H * keySize
 		}
-
+		if key.W != nil {
+			w = *key.W * keySize
+		}
+		ctx.DrawRoundedRectangle(x, y, w, h, spacer)
 		ctx.SetRGB(0., 0., 0.)
 		ctx.StrokePreserve()
 		ctx.SetRGB(1.0, 1.0, 1.0)

internal/lib/root.go

@@ -15,17 +15,26 @@ type GenerateCmd struct {
 	KeyboardName string `arg:"" help:"Keyboard name to fetch layout."`
 
 	File        string `optional:"" short:"f" type:"existingfile" help:"ZMK .keymap file"`
+	LayoutFile  string `optional:"" short:"l" type:"layoutfile" help:"info.json file"`
 	Transparent bool   `optional:"" short:"t" help:"Use a transparent background."`
 	Output      string `optional:"" short:"o" type:"existingdir" default:"." help:"Output directory."`
 }
 
 func (g *GenerateCmd) Run() error {
 	images := make(map[string]image.Image)
 
-	keyboardInfo, err := keyboard.Fetch(g.KeyboardName)
+	var keyboardInfo keyboard.Layouts
+	var err error
+	if g.LayoutFile != "" {
+		keyboardInfo, err = keyboard.LoadFile(g.KeyboardName, g.LayoutFile)
+	} else {
+		keyboardInfo, err = keyboard.Fetch(g.KeyboardName)
+	}
+
 	if err != nil {
 		return err
 	}
+
 	g.KeyboardName = strings.ReplaceAll(g.KeyboardName, "/", "_")
 
 	for layoutName, layout := range keyboardInfo {

pkg/keyboard/keyboard.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/rs/zerolog/log"
@@ -13,7 +14,7 @@ import (
 type Key struct {
 	X     float64  `json:"x"`
 	Y     float64  `json:"y"`
-	W     float64  `json:"w"`
+	W     *float64 `json:"w"`
 	H     *float64 `json:"h"`
 	Label string   `json:"label"`
 }
@@ -72,6 +73,19 @@ func fetch(url string) (*file, error) {
 	return &f, nil
 }
 
+func loadFile(path string) (*Keyboard, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	f := Keyboard{}
+	err = json.Unmarshal(data, &f)
+	if err != nil {
+		return nil, err
+	}
+	return &f, nil
+}
+
 func Fetch(name string) (Layouts, error) {
 	log.Debug().Str("name", name).Send()
 	url := "https://keyboards.qmk.fm/v1/keyboards/%v/info.json"
@@ -84,3 +98,15 @@ func Fetch(name string) (Layouts, error) {
 	l := f.Keyboards[name].Layouts
 	return l, nil
 }
+
+func LoadFile(name, path string) (Layouts, error) {
+	log.Debug().Str("name", name).Send()
+	log.Debug().Str("path", path).Send()
+	f, err := loadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	l := f.Layouts
+	return l, nil
+
+}