clipboard: Add subcommand to-host

Signed-off-by: Paulo Gomes <[email protected]>

Author: pjbgf

README.md

@@ -55,14 +55,19 @@ qubesome start -git https://github.com/qubesome/sample-dotfiles -local <local_gi
 
 Copy clipboard from the host to the i3 profile:
 ```
-qubesome clipboard --from-host i3
+qubesome clip from-host i3
+```
+
+Copy clipboard from the i3 profile to the host:
+```
+qubesome clip to-host i3
 ```
 
 #### Available Commands
 
 - `qubesome start`: Start a qubesome environment for a given profile.
 - `qubesome run`: Run qubesome workloads.
-- `qubesome clipboard`: Manage the images within your workloads.
+- `qubesome clip`: Manage the images within your workloads.
 - `qubesome images`: Manage the images within your workloads.
 - `qubesome xdg`: Handle xdg-open based via qubesome.
 

cmd/cli/clipboard.go

@@ -28,7 +28,8 @@ func clipboardCommand() *cli.Command {
 		Usage:   "enable sharing of clipboard across profiles and the host",
 		Commands: []*cli.Command{
 			{
-				Name: "from-host",
+				Name:  "from-host",
+				Usage: "copies the clipboard contents from the host to a profile",
 				Arguments: []cli.Argument{
 					&cli.StringArg{
 						Name:        "target_profile",
@@ -64,7 +65,8 @@ func clipboardCommand() *cli.Command {
 				},
 			},
 			{
-				Name: "from-profile",
+				Name:  "from-profile",
+				Usage: "copies the clipboard contents between profiles",
 				Arguments: []cli.Argument{
 					&cli.StringArg{
 						Name:        "source_profile",
@@ -105,6 +107,43 @@ func clipboardCommand() *cli.Command {
 						opts = append(opts, clipboard.WithContentType(typ))
 					}
 
+					return clipboard.Run(
+						opts...,
+					)
+				},
+			},
+			{
+				Name:  "to-host",
+				Usage: "copies the clipboard contents from a profile to the host",
+				Arguments: []cli.Argument{
+					&cli.StringArg{
+						Name:        "source_profile",
+						Min:         1,
+						Max:         1,
+						Destination: &sourceProfile,
+					},
+				},
+				Flags: []cli.Flag{
+					clipType,
+				},
+				Action: func(ctx context.Context, c *cli.Command) error {
+					cfg := profileConfigOrDefault(sourceProfile)
+
+					target, ok := cfg.Profiles[sourceProfile]
+					if !ok {
+						return fmt.Errorf("no active profile %q found", sourceProfile)
+					}
+
+					opts := []command.Option[clipboard.Options]{
+						clipboard.WithSourceProfile(target),
+						clipboard.WithTargetHost(),
+					}
+
+					if typ := c.String("type"); typ != "" {
+						fmt.Println(typ)
+						opts = append(opts, clipboard.WithContentType(typ))
+					}
+
 					return clipboard.Run(
 						opts...,
 					)

internal/clipboard/clipboard.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/qubesome/cli/internal/command"
 	"github.com/qubesome/cli/internal/files"
-	"github.com/qubesome/cli/internal/types"
 	"golang.org/x/sys/execabs"
 )
 
@@ -22,37 +21,43 @@ func Run(opts ...command.Option[Options]) error {
 		opt(o)
 	}
 
-	var from uint8
-	var to *types.Profile
+	var from, target uint8
+	var profile string
 
 	if o.SourceProfile != nil {
 		from = o.SourceProfile.Display
+		profile = o.SourceProfile.Name
 	}
 
-	if o.TargetProfile != nil {
-		to = o.TargetProfile
+	if o.TargetProfile == nil && !o.ToHost {
+		return fmt.Errorf("target profile cannot be nil when ToHost is false")
 	}
 
-	if !validTarget(o.ContentType) {
-		return fmt.Errorf("%w: %s", ErrUnsupportedCopyType, o.ContentType)
+	if o.TargetProfile != nil {
+		target = o.TargetProfile.Display
+		profile = o.TargetProfile.Name
 	}
 
-	if from == to.Display {
+	if from == target {
 		return ErrCannotCopyClipboardWithinSameDisplay
 	}
 
+	if !validTarget(o.ContentType) {
+		return fmt.Errorf("%w: %s", ErrUnsupportedCopyType, o.ContentType)
+	}
+
 	targetExtra := ""
 	if o.ContentType != "" {
 		targetExtra = fmt.Sprintf("-t %s", o.ContentType)
 	}
 
-	cookiePath, err := files.ServerCookiePath(to.Name)
+	cookiePath, err := files.ServerCookiePath(profile)
 	if err != nil {
 		return fmt.Errorf("cannot get X magic cookie path: %w", err)
 	}
 
 	xclip := fmt.Sprintf("%s -selection clip -o -display :%d | XAUTHORITY=%s %s -selection clip %s -i -display :%d",
-		files.XclipBinary, int(from), cookiePath, files.XclipBinary, targetExtra, int(to.Display))
+		files.XclipBinary, int(from), cookiePath, files.XclipBinary, targetExtra, int(target))
 
 	slog.Debug("clipboard copy", "command", []string{files.ShBinary, "-c", xclip})
 	cmd := execabs.Command(files.ShBinary, "-c", xclip) //nolint

internal/clipboard/clipboard_test.go

@@ -30,6 +30,11 @@ func TestCopy(t *testing.T) {
 			target:  "foo",
 			wantErr: "unsupported copy type",
 		},
+		{
+			name:    "no target",
+			from:    &types.Profile{Display: 0},
+			wantErr: "target profile cannot be nil when ToHost is false",
+		},
 	}
 
 	for _, tc := range tests {

internal/clipboard/options.go

@@ -7,6 +7,7 @@ import (
 
 type Options struct {
 	FromHost      bool
+	ToHost        bool
 	SourceProfile *types.Profile
 	TargetProfile *types.Profile
 	ContentType   string
@@ -29,8 +30,15 @@ func WithTargetProfile(p *types.Profile) command.Option[Options] {
 		o.TargetProfile = p
 	}
 }
+
 func WithContentType(t string) command.Option[Options] {
 	return func(o *Options) {
 		o.ContentType = t
 	}
 }
+
+func WithTargetHost() command.Option[Options] {
+	return func(o *Options) {
+		o.ToHost = true
+	}
+}