feat: support completion for multiple services

cmd/completion.go

@@ -116,7 +116,7 @@ func noMoreArgsComp() ([]string, cobra.ShellCompDirective) {
 }
 
 // support function for completion
-func compListStates(_ string, ignoredStates []string, service string, state string, h *pkg.Hctl) ([]string, cobra.ShellCompDirective) {
+func compListStates(_ string, ignoredStates []string, serviceCaps []string, state string, h *pkg.Hctl) ([]string, cobra.ShellCompDirective) {
 	states, err := h.GetStates()
 	if err != nil {
 		log.Debug().Caller().Msgf("Error: %+v", err)
@@ -127,7 +127,7 @@ func compListStates(_ string, ignoredStates []string, service string, state stri
 	}
 
 	filteredStates := filterStates(states, ignoredStates)
-	filteredStates = filterCapable(filteredStates, services, service, state)
+	filteredStates = filterCapable(filteredStates, services, serviceCaps, state)
 
 	var choices []string
 	for _, rel := range filteredStates {

cmd/filter.go

@@ -15,6 +15,7 @@
 package cmd
 
 import (
+	"slices"
 	"strings"
 
 	"github.com/xx4h/hctl/pkg/rest"
@@ -43,7 +44,7 @@ func filterStates(states []rest.HassState, ignoredStates []string) []rest.HassSt
 }
 
 // Filter states with given service capability and state
-func filterCapable(states []rest.HassState, services []rest.HassService, service string, state string) []rest.HassState {
+func filterCapable(states []rest.HassState, services []rest.HassService, serviceCaps []string, state string) []rest.HassState {
 	// get all service domains that have "turn_on" as domain service
 	// split state.EntryId domain=[0] entity=[1]
 	// create list of states that are in a domain having "turn_on" as domain service
@@ -52,7 +53,7 @@ func filterCapable(states []rest.HassState, services []rest.HassService, service
 	var filteredStates []rest.HassState
 	for _, rel := range services {
 		for name := range rel.Services {
-			if name == service {
+			if slices.Contains(serviceCaps, name) {
 				capableServices = append(capableServices, rel)
 			}
 		}

cmd/off.go

@@ -34,7 +34,7 @@ func newOffCmd(h *pkg.Hctl, _ io.Writer) *cobra.Command {
 			if len(args) != 0 {
 				return noMoreArgsComp()
 			}
-			return compListStates(toComplete, args, "turn_off", "on", h)
+			return compListStates(toComplete, args, []string{"turn_off"}, "on", h)
 		},
 		Run: func(_ *cobra.Command, args []string) {
 			c := h.GetRest()

cmd/on.go

@@ -32,7 +32,7 @@ func newOnCmd(h *pkg.Hctl) *cobra.Command {
 			if len(args) != 0 {
 				return noMoreArgsComp()
 			}
-			return compListStates(toComplete, args, "turn_on", "off", h)
+			return compListStates(toComplete, args, []string{"turn_on"}, "off", h)
 		},
 		Run: func(_ *cobra.Command, args []string) {
 			c := h.GetRest()

cmd/play.go

@@ -33,7 +33,7 @@ func newPlayCmd(h *pkg.Hctl, _ io.Writer) *cobra.Command {
 			if len(args) != 0 {
 				return nil, cobra.ShellCompDirectiveDefault
 			}
-			return compListStates(toComplete, args, "play_media", "", h)
+			return compListStates(toComplete, args, []string{"play_media"}, "", h)
 		},
 		Run: func(_ *cobra.Command, args []string) {
 			h.PlayMusic(args[0], args[1])

cmd/toggle.go

@@ -35,7 +35,7 @@ func newToggleCmd(h *pkg.Hctl, _ io.Writer) *cobra.Command {
 			if len(args) != 0 {
 				return noMoreArgsComp()
 			}
-			return compListStates(toComplete, args, "toggle", "", h)
+			return compListStates(toComplete, args, []string{"toggle"}, "", h)
 		},
 		Run: func(_ *cobra.Command, args []string) {
 			c := h.GetRest()

cmd/volume.go

@@ -36,7 +36,7 @@ func newVolumeCmd(h *pkg.Hctl, _ io.Writer) *cobra.Command {
 		Args:    cobra.MatchAll(cobra.ExactArgs(2)),
 		ValidArgsFunction: func(_ *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 			if len(args) == 0 {
-				return compListStates(toComplete, args, "volume_set", "", h)
+				return compListStates(toComplete, args, []string{"volume_set"}, "", h)
 			} else if len(args) == 1 {
 				return volRange, cobra.ShellCompDirectiveNoFileComp
 			}