Migrate to nugafile dumps format

.github/workflows/quality-assurance.yaml

@@ -28,6 +28,7 @@ jobs:
       - name: Check code style with revive
         uses: docker://morphy/revive-action:v2
         with:
+          exclude: "./examples/..."
           config: revive.toml
           path: "./..."
   test:

Makefile

@@ -2,10 +2,10 @@ GOLANGCI_LINT_VERSION = v1.56.2
 REVIVE_VERSION = v1.3.7
 GIT_CHGLOG_VERSION = v0.15.4
 GO_BIN_PATH := $(shell go env GOPATH)/bin
-TEST_MODULES := $(shell go list ./... | grep -v /cmd/)
+TEST_MODULES := $(shell go list ./... | grep -v /examples/)
 
 define build_app
-	cd "cmd/$1"; go build -o "../../build/nuga-$1"
+	cd "examples/$1"; go build -o "../../build/nuga-$1"
 endef
 
 .PHONY: setup
@@ -18,8 +18,8 @@ setup:
 
 .PHONY: lint
 lint:
-	golangci-lint run ./...
-	revive -config ./revive.toml  ./...
+	golangci-lint run --skip-dirs ./examples ./...
+	revive -exclude ./examples/... -config ./revive.toml  ./...
 
 .PHONY: test
 test:

dump/collect.go

@@ -3,68 +3,28 @@ package dump
 
 import (
 	"github.com/mishamyrt/nuga-lib/device"
-	"github.com/mishamyrt/nuga-lib/features/keys"
-	"github.com/mishamyrt/nuga-lib/features/light"
+	"github.com/mishamyrt/nuga-lib/features"
 	"github.com/mishamyrt/nuga-lib/hid"
-	"github.com/mishamyrt/nuga-lib/internal/slices"
 )
 
 // Collect device state
-func Collect(h hid.Handler) (State, error) {
-	lightsState, err := collectLights(h)
+func Collect(dev *hid.Device) (*State, error) {
+	model := device.Model(dev.Info.Model)
+	f := features.New(dev, model)
+	lights, err := f.Light.GetStateData()
 	if err != nil {
-		return State{}, err
+		return nil, err
 	}
-	keysState, err := collectKeys(h)
+	keys, err := f.Keys.GetStateData()
 	if err != nil {
-		return State{}, err
+		return nil, err
 	}
-	info := h.GetInfo()
-	return State{
-		Name:     device.Model(info.Model),
-		Firmware: info.Firmware,
-		Lights:   lightsState,
-		Keys:     keysState,
+	return &State{
+		Model:    model,
+		Firmware: dev.Info.Firmware,
+		Data: features.StateData{
+			Lights: lights,
+			Keys:   keys,
+		},
 	}, nil
 }
-
-func collectLights(h hid.Handler) (light.State, error) {
-	var state light.State
-	var err error
-	lightsFeature := light.New(h, nil)
-	params, err := lightsFeature.GetRawEffects()
-	if err != nil {
-		return state, err
-	}
-	colors, err := lightsFeature.GetRawColors()
-	if err != nil {
-		return state, err
-	}
-	state.Params = slices.Cast[byte, int](params)
-	state.Colors = slices.Cast[byte, int](colors)
-	return state, nil
-}
-
-func collectKeys(h hid.Handler) (keys.State, error) {
-	var state keys.State
-	var err error
-	keysFeature := keys.New(h, nil)
-	state.Mac, err = keysFeature.GetMacCodes()
-	if err != nil {
-		return state, err
-	}
-	state.Win, err = keysFeature.GetWinCodes()
-	if err != nil {
-		return state, err
-	}
-	macros, err := keysFeature.GetMacros()
-	if err != nil {
-		return state, err
-	}
-	macrosData, err := macros.Bytes()
-	if err != nil {
-		return state, err
-	}
-	state.Macros = macrosData
-	return state, nil
-}

dump/defaults.go

@@ -13,7 +13,7 @@ var defaults embed.FS
 
 // GetDefaults returns default state for given model
 func GetDefaults(model device.Model) (*State, error) {
-	filePath := fmt.Sprintf("defaults/%v.json", string(model))
+	filePath := fmt.Sprintf("defaults/%v.nugafile", string(model))
 	data, err := defaults.ReadFile(filePath)
 	if err != nil {
 		return nil, err