Use typed enums for cleaner parsing.

cmd/joyful/config.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"context"
-	"strings"
 	"sync"
 
 	"git.annabunches.net/annabunches/joyful/internal/configparser"
@@ -16,7 +15,7 @@ func initPhysicalDevices(conf *configparser.Config) map[string]*evdev.InputDevic
 	pDeviceMap := make(map[string]*evdev.InputDevice)
 
 	for _, devConfig := range conf.Devices {
-		if strings.ToLower(devConfig.Type) != configparser.DeviceTypePhysical {
+		if devConfig.Type != configparser.DeviceTypePhysical {
 			continue
 		}
 
@@ -71,7 +70,7 @@ func initVirtualBuffers(config *configparser.Config) (map[string]*evdev.InputDev
 	vBuffersByDevice := make(map[*evdev.InputDevice]*virtualdevice.EventBuffer)
 
 	for _, devConfig := range config.Devices {
-		if strings.ToLower(devConfig.Type) != configparser.DeviceTypeVirtual {
+		if devConfig.Type != configparser.DeviceTypeVirtual {
 			continue
 		}
 

internal/configparser/schema.go

@@ -15,12 +15,12 @@ type Config struct {
 
 // These top-level structs use custom unmarshaling to unpack each available sub-type
 type DeviceConfig struct {
-	Type   string
+	Type   DeviceType
 	Config interface{}
 }
 
 type RuleConfig struct {
-	Type   string
+	Type   RuleType
 	Name   string
 	Modes  []string
 	Config interface{}
@@ -119,7 +119,7 @@ type RuleTargetConfigModeSelect struct {
 
 func (dc *DeviceConfig) UnmarshalYAML(unmarshal func(data interface{}) error) error {
 	metaConfig := &struct {
-		Type string
+		Type DeviceType
 	}{}
 	err := unmarshal(metaConfig)
 	if err != nil {
@@ -145,7 +145,7 @@ func (dc *DeviceConfig) UnmarshalYAML(unmarshal func(data interface{}) error) er
 
 func (dc *RuleConfig) UnmarshalYAML(unmarshal func(data interface{}) error) error {
 	metaConfig := &struct {
-		Type  string
+		Type  RuleType
 		Name  string
 		Modes []string
 	}{}

internal/configparser/variables.go

@@ -1,15 +1,21 @@
 package configparser
 
-const (
+type DeviceType string
-	DeviceTypePhysical = "physical"
-	DeviceTypeVirtual  = "virtual"
 
-	RuleTypeButton        = "button"
+const (
-	RuleTypeButtonCombo   = "button-combo"
+	DeviceTypePhysical DeviceType = "physical"
-	RuleTypeButtonLatched = "button-latched"
+	DeviceTypeVirtual  DeviceType = "virtual"
-	RuleTypeAxis          = "axis"
+)
-	RuleTypeAxisCombined  = "axis-combined"
+
-	RuleTypeAxisToButton  = "axis-to-button"
+type RuleType string
-	RuleTypeAxisToRelaxis = "axis-to-relaxis"
+
-	RuleTypeModeSelect    = "mode-select"
+const (
+	RuleTypeButton        RuleType = "button"
+	RuleTypeButtonCombo   RuleType = "button-combo"
+	RuleTypeButtonLatched RuleType = "button-latched"
+	RuleTypeAxis          RuleType = "axis"
+	RuleTypeAxisCombined  RuleType = "axis-combined"
+	RuleTypeAxisToButton  RuleType = "axis-to-button"
+	RuleTypeAxisToRelaxis RuleType = "axis-to-relaxis"
+	RuleTypeModeSelect    RuleType = "mode-select"
 )

internal/mappingrules/init_rules.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"slices"
-	"strings"
 
 	"git.annabunches.net/annabunches/joyful/internal/configparser"
 	"git.annabunches.net/annabunches/joyful/internal/logger"
@@ -33,24 +32,25 @@ func NewRule(config configparser.RuleConfig, pDevs map[string]Device, vDevs map[
 
 	base := NewMappingRuleBase(config.Name, config.Modes)
 
-	switch strings.ToLower(config.Type) {
+	switch config.Type {
-	case RuleTypeButton:
+	case configparser.RuleTypeButton:
 		newRule, err = NewMappingRuleButton(config.Config.(configparser.RuleConfigButton), pDevs, vDevs, base)
-	case RuleTypeButtonCombo:
+	case configparser.RuleTypeButtonCombo:
 		newRule, err = NewMappingRuleButtonCombo(config.Config.(configparser.RuleConfigButtonCombo), pDevs, vDevs, base)
-	case RuleTypeButtonLatched:
+	case configparser.RuleTypeButtonLatched:
 		newRule, err = NewMappingRuleButtonLatched(config.Config.(configparser.RuleConfigButtonLatched), pDevs, vDevs, base)
-	case RuleTypeAxis:
+	case configparser.RuleTypeAxis:
 		newRule, err = NewMappingRuleAxis(config.Config.(configparser.RuleConfigAxis), pDevs, vDevs, base)
-	case RuleTypeAxisCombined:
+	case configparser.RuleTypeAxisCombined:
 		newRule, err = NewMappingRuleAxisCombined(config.Config.(configparser.RuleConfigAxisCombined), pDevs, vDevs, base)
-	case RuleTypeAxisToButton:
+	case configparser.RuleTypeAxisToButton:
 		newRule, err = NewMappingRuleAxisToButton(config.Config.(configparser.RuleConfigAxisToButton), pDevs, vDevs, base)
-	case RuleTypeAxisToRelaxis:
+	case configparser.RuleTypeAxisToRelaxis:
 		newRule, err = NewMappingRuleAxisToRelaxis(config.Config.(configparser.RuleConfigAxisToRelaxis), pDevs, vDevs, base)
-	case RuleTypeModeSelect:
+	case configparser.RuleTypeModeSelect:
 		newRule, err = NewMappingRuleModeSelect(config.Config.(configparser.RuleConfigModeSelect), pDevs, modes, base)
 	default:
+		// Shouldn't actually be possible to get here...
 		err = fmt.Errorf("bad rule type '%s' for rule '%s'", config.Type, config.Name)
 	}
 

internal/mappingrules/variables.go

@@ -1,12 +0,0 @@
-package mappingrules
-
-const (
-	RuleTypeButton        = "button"
-	RuleTypeButtonCombo   = "button-combo"
-	RuleTypeButtonLatched = "button-latched"
-	RuleTypeAxis          = "axis"
-	RuleTypeAxisCombined  = "axis-combined"
-	RuleTypeAxisToButton  = "axis-to-button"
-	RuleTypeAxisToRelaxis = "axis-to-relaxis"
-	RuleTypeModeSelect    = "mode-select"
-)