fix layerfile

MetalBlueberry · Dec 8, 2020 · 5db030a · 5db030a
1 parent d1b726a
commit 5db030a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/cmd/chkb/main.go b/cmd/chkb/main.go
@@ -2,13 +2,17 @@ package main
 
 import (
 	"MetalBlueberry/cheap-keyboard/pkg/chkb"
+	"MetalBlueberry/cheap-keyboard/pkg/deliverers/layerFile"
 	"MetalBlueberry/cheap-keyboard/pkg/deliverers/vkb"
 	"flag"
 	"fmt"
 	"os"
+	"os/user"
+	"path/filepath"
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/spf13/afero"
 
 	"github.com/bendahl/uinput"
 	evdev "github.com/gvalkov/golang-evdev"
@@ -54,16 +58,16 @@ func main() {
 	}
 	kb := chkb.NewKeyboard(book, "base")
 
-	// usr, err := user.Current()
-	// if err != nil {
-	// 	log.Fatal(err)
-	// }
+	usr, err := user.Current()
+	if err != nil {
+		log.Fatal(err)
+	}
 
-	// lf, err := layerFile.NewLayerFile(afero.NewOsFs(), kb.Mapper, filepath.Join(usr.HomeDir, ".chkb_layout"))
-	// if err != nil {
-	// 	log.Fatal(err)
-	// }
-	// kb.AddDeliverer(lf)
+	lf, err := layerFile.NewLayerFile(afero.NewOsFs(), kb, filepath.Join(usr.HomeDir, ".chkb_layout"))
+	if err != nil {
+		log.Fatal(err)
+	}
+	kb.AddDeliverer(lf)
 
 	defer dev.Release()
 	err = dev.Grab()

diff --git a/pkg/deliverers/layerFile/layerFile.go b/pkg/deliverers/layerFile/layerFile.go
@@ -9,12 +9,12 @@ import (
 )
 
 type LayerFile struct {
-	mapper *chkb.Mapper
+	mapper *chkb.Keyboard
 
 	afero.File
 }
 
-func NewLayerFile(fs afero.Fs, kb *chkb.Mapper, fileName string) (*LayerFile, error) {
+func NewLayerFile(fs afero.Fs, kb *chkb.Keyboard, fileName string) (*LayerFile, error) {
 	lf := &LayerFile{
 		mapper: kb,
 	}
@@ -39,11 +39,11 @@ func (lf *LayerFile) Deliver(event chkb.MapEvent) (handled bool, err error) {
 	return false, nil
 }
 
-func layerString(kb *chkb.Mapper) string {
+func layerString(kb *chkb.Keyboard) string {
 	builder := strings.Builder{}
-	for i := range kb.Layers {
-		for name := range kb.LayerBook {
-			if kb.Layers[i] == kb.LayerBook[name] {
+	for i := range kb.Mapper.Layers {
+		for name := range kb.Config.Layers {
+			if kb.Mapper.Layers[i] == kb.Config.Layers[name] {
 				builder.WriteString(name)
 				builder.WriteString(" > ")
 			}

diff --git a/pkg/deliverers/layerFile/layerFile_test.go b/pkg/deliverers/layerFile/layerFile_test.go
@@ -42,7 +42,7 @@ func TestLayerFile_Deliver(t *testing.T) {
 			},
 			fields: fields{
 				File: func() *LayerFile {
-					f, err := NewLayerFile(mfs, chkb.NewMapper(book, "l0"), "file")
+					f, err := NewLayerFile(mfs, chkb.NewKeyboard(book, "l0"), "file")
 					if err != nil {
 						panic(err)
 					}
@@ -64,7 +64,7 @@ func TestLayerFile_Deliver(t *testing.T) {
 			},
 			fields: fields{
 				File: func() *LayerFile {
-					f, err := NewLayerFile(mfs, chkb.NewMapper(book, "l0"), "file")
+					f, err := NewLayerFile(mfs, chkb.NewKeyboard(book, "l0"), "file")
 					if err != nil {
 						panic(err)
 					}
@@ -87,7 +87,7 @@ func TestLayerFile_Deliver(t *testing.T) {
 			},
 			fields: fields{
 				File: func() *LayerFile {
-					f, err := NewLayerFile(mfs, chkb.NewMapper(book, "l0"), "file")
+					f, err := NewLayerFile(mfs, chkb.NewKeyboard(book, "l0"), "file")
 					if err != nil {
 						panic(err)
 					}
@@ -110,7 +110,7 @@ func TestLayerFile_Deliver(t *testing.T) {
 			},
 			fields: fields{
 				File: func() *LayerFile {
-					f, err := NewLayerFile(mfs, chkb.NewMapper(book, "l0"), "file")
+					f, err := NewLayerFile(mfs, chkb.NewKeyboard(book, "l0"), "file")
 					if err != nil {
 						panic(err)
 					}