subkey for triggers

Author: abe-winter

main.go

@@ -1,13 +1,15 @@
+//go:build windows
+
 package main
 
 import (
-	"win-reg-sensor/models"
 	"context"
+	"win-reg-sensor/models"
+
+	"go.viam.com/rdk/components/sensor"
 	"go.viam.com/rdk/logging"
 	"go.viam.com/rdk/module"
 	"go.viam.com/utils"
-	"go.viam.com/rdk/components/sensor"
-
 )
 
 func main() {
@@ -19,12 +21,11 @@ func mainWithArgs(ctx context.Context, args []string, logger logging.Logger) err
 	if err != nil {
 		return err
 	}
-	
+
 	if err = winRegSensor.AddModelFromRegistry(ctx, sensor.API, models.Registry); err != nil {
 		return err
 	}
 
-
 	err = winRegSensor.Start(ctx)
 	defer winRegSensor.Close(ctx)
 	if err != nil {

models/module.go

@@ -1,8 +1,11 @@
+//go:build windows
+
 package models
 
 import (
 	"context"
 	"errors"
+	"strings"
 
 	errw "github.com/pkg/errors"
 	"go.viam.com/rdk/components/sensor"
@@ -86,9 +89,14 @@ func (s *winRegSensorRegistry) NewClientFromConn(ctx context.Context, conn rpc.C
 func (s *winRegSensorRegistry) Readings(ctx context.Context, extra map[string]any) (map[string]any, error) {
 	ret := make(map[string]any)
 	s.logger.Debugf("reading %d keys", len(s.cfg.Keys))
-	for _, key := range s.cfg.Keys {
+	for _, fullKey := range s.cfg.Keys {
 		subMap := make(map[string]any)
-		ret[key] = subMap
+		// note: in colon/subKey mode, we set a single value instead of the submap.
+		// we do this because triggers can't access nested maps.
+		key, subKey, hasColon := strings.Cut(fullKey, ":")
+		if !hasColon {
+			ret[fullKey] = subMap
+		}
 		err := func() error {
 			s.logger.Debugf("opening key %s", key)
 			k, err := registry.OpenKey(registry.LOCAL_MACHINE, key, registry.QUERY_VALUE)
@@ -110,6 +118,9 @@ func (s *winRegSensorRegistry) Readings(ctx context.Context, extra map[string]an
 				}
 				subMap[name] = val
 			}
+			if hasColon {
+				ret[fullKey] = subMap[subKey]
+			}
 			return nil
 		}()
 		if err != nil {