bluetoothctl: extracted actions (#2314)

completers/bluetoothctl_completer/cmd/agent.go

@@ -2,7 +2,8 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
+	"github.com/carapace-sh/carapace/pkg/style"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +17,9 @@ func init() {
 	carapace.Gen(agentCmd).Standalone()
 	rootCmd.AddCommand(agentCmd)
 	carapace.Gen(agentCmd).PositionalCompletion(
-		action.ActionAgents(),
+		carapace.Batch(
+			carapace.ActionValues("off", "on", "auto").StyleF(style.ForKeyword),
+			bluetoothctl.ActionAgentCapabilities(),
+		).ToA(),
 	)
 }

completers/bluetoothctl_completer/cmd/block.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(blockCmd).Standalone()
 	rootCmd.AddCommand(blockCmd)
 	carapace.Gen(blockCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/cancelPairing.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(cancelPairingCmd).Standalone()
 	rootCmd.AddCommand(cancelPairingCmd)
 	carapace.Gen(cancelPairingCmd).PositionalCompletion(
-		action.ActionDevices("Paired"),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{Paired: true}),
 	)
 }

completers/bluetoothctl_completer/cmd/connect.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(connectCmd).Standalone()
 	rootCmd.AddCommand(connectCmd)
 	carapace.Gen(connectCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/devices.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace/pkg/style"
 	"github.com/spf13/cobra"
 )
 
@@ -15,6 +16,11 @@ func init() {
 	carapace.Gen(devicesCmd).Standalone()
 	rootCmd.AddCommand(devicesCmd)
 	carapace.Gen(devicesCmd).PositionalCompletion(
-		carapace.ActionValues("Paired", "Bonded", "Trusted", "Connected"),
+		carapace.ActionStyledValues(
+			"Paired", style.Yellow,
+			"Bonded", style.Magenta,
+			"Trusted", style.Green,
+			"Connected", style.Blue,
+		),
 	)
 }

completers/bluetoothctl_completer/cmd/disconnect.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(disconnectCmd).Standalone()
 	rootCmd.AddCommand(disconnectCmd)
 	carapace.Gen(disconnectCmd).PositionalCompletion(
-		action.ActionDevices("Connected"),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{Connected: true}),
 	)
 }

completers/bluetoothctl_completer/cmd/info.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(infoCmd).Standalone()
 	rootCmd.AddCommand(infoCmd)
 	carapace.Gen(infoCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/pair.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(pairCmd).Standalone()
 	rootCmd.AddCommand(pairCmd)
 	carapace.Gen(pairCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/remove.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(removeCmd).Standalone()
 	rootCmd.AddCommand(removeCmd)
 	carapace.Gen(removeCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/root.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -28,6 +28,6 @@ func init() {
 	rootCmd.Flags().BoolP("version", "v", false, "Display version")
 
 	carapace.Gen(rootCmd).FlagCompletion(carapace.ActionMap{
-		"agent": action.ActionAgents(),
+		"agent": bluetoothctl.ActionAgentCapabilities(),
 	})
 }

completers/bluetoothctl_completer/cmd/select.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(selectCmd).Standalone()
 	rootCmd.AddCommand(selectCmd)
 	carapace.Gen(selectCmd).PositionalCompletion(
-		action.ActionControllers(),
+		bluetoothctl.ActionControllers(),
 	)
 }

completers/bluetoothctl_completer/cmd/show.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(showCmd).Standalone()
 	rootCmd.AddCommand(showCmd)
 	carapace.Gen(showCmd).PositionalCompletion(
-		action.ActionControllers(),
+		bluetoothctl.ActionControllers(),
 	)
 }

completers/bluetoothctl_completer/cmd/trust.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(trustCmd).Standalone()
 	rootCmd.AddCommand(trustCmd)
 	carapace.Gen(trustCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/unblock.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(unblockCmd).Standalone()
 	rootCmd.AddCommand(unblockCmd)
 	carapace.Gen(unblockCmd).PositionalCompletion(
-		action.ActionDevices(""),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{}.Default()),
 	)
 }

completers/bluetoothctl_completer/cmd/untrust.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/completers/bluetoothctl_completer/cmd/action"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bluetoothctl"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +16,6 @@ func init() {
 	carapace.Gen(untrustCmd).Standalone()
 	rootCmd.AddCommand(untrustCmd)
 	carapace.Gen(untrustCmd).PositionalCompletion(
-		action.ActionDevices("Trusted"),
+		bluetoothctl.ActionDevices(bluetoothctl.DeviceOpts{Trusted: true}),
 	)
 }

pkg/actions/tools/bluetoothctl/agent.go

@@ -0,0 +1,17 @@
+package bluetoothctl
+
+import "github.com/carapace-sh/carapace"
+
+// ActionAgentCapabilities completes agent capabilities
+//
+//	NoInputNoOutput
+//	KeyboardOnly
+func ActionAgentCapabilities() carapace.Action {
+	return carapace.ActionValues(
+		"NoInputNoOutput",
+		"KeyboardOnly",
+		"KeyboardDisplay",
+		"DisplayYesNo",
+		"DisplayOnly",
+	).Tag("bluetooth agent capabilities")
+}

pkg/actions/tools/bluetoothctl/controller.go

@@ -0,0 +1,27 @@
+package bluetoothctl
+
+import (
+	"strings"
+
+	"github.com/carapace-sh/carapace"
+)
+
+// ActionControllers completes controllers
+func ActionControllers() carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		return carapace.ActionExecCommand("bluetoothctl", "list")(func(output []byte) carapace.Action {
+			lines := strings.Split(string(output), "\n")
+			vals := make([]string, 0)
+
+			for _, line := range lines {
+				if line == "" {
+					break
+				}
+
+				fields := strings.Fields(line)
+				vals = append(vals, fields[1], strings.Join(fields[2:], " "))
+			}
+			return carapace.ActionValuesDescribed(vals...)
+		})
+	}).Tag("bluetooth controllers")
+}