parse attach command

cmd/edit.go

@@ -2,46 +2,46 @@ package cmd
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"os/exec"
 	"strings"
 	"syscall"
 )
 
-func Edit(filename, session, client string) {
-	fmt.Println(session, client)
-	if session != "" && client != "" {
+func Edit(filename, session, client string) error {
+	if filename != "" && session != "" && client != "" && client != "-" {
 		kakCommand := fmt.Sprintf("edit %s", filename)
 		Send(kakCommand, session, client)
 		os.Exit(0)
 	}
 
 	kakBinary, err := exec.LookPath("kak")
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
-	kakExecArgs := []string{"kak"}
-
 	sessions, err := exec.Command("kak", "-l").Output()
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
+	kakExecArgs := []string{"kak"}
 	if session != "" && strings.Contains(string(sessions), session) {
 		kakExecArgs = append(kakExecArgs, "-c", session)
 	} else if session != "" {
 		// TODO: this gets killed if parent shell closes, use setsid?
 		kakExecArgs = append(kakExecArgs, "-s", session)
 	}
 
-	kakExecArgs = append(kakExecArgs, filename)
+	if filename != "" {
+		kakExecArgs = append(kakExecArgs, filename)
+	}
 
-	fmt.Print(kakExecArgs)
+	fmt.Println("edit", kakExecArgs)
 
 	execErr := syscall.Exec(kakBinary, kakExecArgs, os.Environ())
 	if execErr != nil {
-		log.Fatal(err)
+		return err
 	}
+	return nil
 }

cmd/list.go

@@ -43,7 +43,11 @@ func List() {
 
 	for _, session := range sessions {
 		for _, client := range session.clients {
-			fmt.Printf("%s\t%s\t%s\n", session.name, client, session.dir)
+			if client != "" {
+				fmt.Printf("%s\t%s\t%s\n", session.name, client, session.dir)
+			} else {
+				fmt.Printf("%s\t%s\t%s\n", session.name, "-", session.dir)
+			}
 		}
 	}
 

main.go

@@ -90,6 +90,16 @@ func main() {
 		cmd.Edit(filename, context.session, context.client)
 	}
 
+	if attachCmd.Parsed() {
+		context, err := getContext()
+		if err != nil {
+			log.Fatal(err)
+		}
+		if err := cmd.Edit("", context.session, context.client); err != nil {
+			log.Fatal(err)
+		}
+	}
+
 	if sendCmd.Parsed() {
 		args := sendCmd.Args()
 		kakCommand := strings.Join(args, " ")