anna/joyful
1
0
Fork 0
Code Pull requests Releases Activity Actions

Refactor logging and start adding rule matching code.

Browse source
This commit is contained in:
Anna Rose Wiggins 2025-06-27 22:35:17 -04:00
parent 8549f36c8f
commit 33837895d9
4 changed files with 92 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cmd/joyful/main.go
View file

@ -2,9 +2,9 @@ package main
import (
"fmt"
"os"
"time"
"git.annabunches.net/annabunches/joyful/internal/logger"
"git.annabunches.net/annabunches/joyful/internal/virtualdevice"
"github.com/holoplot/go-evdev"
)
@ -38,7 +38,7 @@ func main() {
},
},
)
fatalIfError(err, "Failed to create virtual device")
logger.FatalIfError(err, "Failed to create virtual device")
buffer := virtualdevice.NewEventBuffer(vDevice)
@ -49,7 +49,7 @@ func main() {
fmt.Printf("Virtual device created as %s.\n", name)
pDevice, err := evdev.Open("/dev/input/event12")
fatalIfError(err, "Couldn't open physical device")
logger.FatalIfError(err, "Couldn't open physical device")
name, err = pDevice.Name()
if err != nil {
@ -63,7 +63,7 @@ func main() {
last := combo
event, err := pDevice.ReadOne()
logIfError(err, "Error while reading event")
logger.LogIfError(err, "Error while reading event")
// FIXME: test code
for event.Code != evdev.SYN_REPORT {
@ -103,7 +103,7 @@ func main() {
}
event, err = pDevice.ReadOne()
logIfError(err, "Error while reading event")
logger.LogIfError(err, "Error while reading event")
}
if combo > last && combo == 3 {
@ -144,20 +144,3 @@ func jsButtons() []evdev.EvCode {
return buttons
}
func logIfError(err error, msg string) {
if err == nil {
return
}
fmt.Printf("%s: %s\n", msg, err.Error())
}
func fatalIfError(err error, msg string) {
if err == nil {
return
}
logIfError(err, msg)
os.Exit(1)
}