feat: add icons and json flags to list (#74)

* chore: remove choose command
* In favor of the user customizing fzf or any other tool on their own
* feat: restructure list formatting and add icon support
* chore: reduce lines on tmux session struct
* feat: add json support to sesh list

Author: joshmedeski

cmds/choose.go

@@ -6,6 +6,8 @@ import (
 
 	cli "github.com/urfave/cli/v2"
 
+	"github.com/joshmedeski/sesh/icons"
+	"github.com/joshmedeski/sesh/json"
 	"github.com/joshmedeski/sesh/session"
 )
 
@@ -16,6 +18,11 @@ func List() *cli.Command {
 		Usage:                  "List sessions",
 		UseShortOptionHandling: true,
 		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:    "json",
+				Aliases: []string{"j"},
+				Usage:   "output as json",
+			},
 			&cli.BoolFlag{
 				Name:    "tmux",
 				Aliases: []string{"t"},
@@ -31,6 +38,11 @@ func List() *cli.Command {
 				Aliases: []string{"H"},
 				Usage:   "don't show currently attached sessions",
 			},
+			&cli.BoolFlag{
+				Name:    "icons",
+				Aliases: []string{"i"},
+				Usage:   "show Nerd Font icons",
+			},
 		},
 		Action: func(cCtx *cli.Context) error {
 			o := session.Options{
@@ -40,7 +52,23 @@ func List() *cli.Command {
 				Tmux:   cCtx.Bool("tmux"),
 				Zoxide: cCtx.Bool("zoxide"),
 			})
-			fmt.Println(strings.Join(sessions, "\n"))
+
+			useIcons := cCtx.Bool("icons")
+			result := make([]string, len(sessions))
+			for i, session := range sessions {
+				if useIcons {
+					result[i] = icons.PrintWithIcon(session)
+				} else {
+					result[i] = session.Name
+				}
+			}
+
+			useJson := cCtx.Bool("json")
+			if useJson {
+				fmt.Println(json.List(sessions))
+			} else {
+				fmt.Println(strings.Join(result, "\n"))
+			}
 			return nil
 		},
 	}

cmds/list.go

@@ -2,8 +2,10 @@ package connect
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/joshmedeski/sesh/config"
+	"github.com/joshmedeski/sesh/icons"
 	"github.com/joshmedeski/sesh/session"
 	"github.com/joshmedeski/sesh/tmux"
 	"github.com/joshmedeski/sesh/zoxide"
@@ -15,10 +17,15 @@ func Connect(
 	command string,
 	config *config.Config,
 ) error {
+	if strings.HasPrefix(choice, icons.TmuxIcon) || strings.HasPrefix(choice, icons.ZoxideIcon) {
+		choice = choice[4:]
+	}
+
 	session, err := session.Determine(choice, config)
 	if err != nil {
 		return fmt.Errorf("unable to connect to %q: %w", choice, err)
 	}
+
 	if err = zoxide.Add(session.Path); err != nil {
 		return fmt.Errorf("unable to connect to %q: %w", choice, err)
 	}

connect/connect.go

@@ -0,0 +1,27 @@
+package icons
+
+import (
+	"fmt"
+
+	"github.com/joshmedeski/sesh/session"
+)
+
+// TODO: add to config to allow for custom icons
+var (
+	ZoxideIcon string = ""
+	TmuxIcon   string = ""
+)
+
+func ansiString(code int, s string) string {
+	return fmt.Sprintf("\033[%dm%s\033[39m", code, s)
+}
+
+func PrintWithIcon(s session.Session) string {
+	icon := ZoxideIcon
+	colorCode := 36 // cyan
+	if s.Src == "tmux" {
+		icon = TmuxIcon
+		colorCode = 34 // blue
+	}
+	return fmt.Sprintf("%s %s", ansiString(colorCode, icon), s.Name)
+}

icons/icons.go

@@ -0,0 +1,19 @@
+package json
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/joshmedeski/sesh/session"
+)
+
+func List(sessions []session.Session) string {
+	jsonSessions, err := json.Marshal(sessions)
+	if err != nil {
+		fmt.Printf(
+			"Couldn't list sessions as json: %s\n",
+			err,
+		)
+	}
+	return string(jsonSessions)
+}

json/json.go

@@ -1,11 +1,10 @@
-package session
+package name
 
 import (
 	"path"
 	"path/filepath"
 	"strings"
 
-	"github.com/joshmedeski/sesh/config"
 	"github.com/joshmedeski/sesh/git"
 )
 
@@ -48,7 +47,7 @@ func nameFromGit(result string) string {
 	return nameFromGit
 }
 
-func DetermineName(result string, config *config.Config) string {
+func DetermineName(result string) string {
 	name := result
 	// TODO: parent directory config option detection
 	pathName := nameFromPath(result)

session/name.go renamed to name/name.go

@@ -13,7 +13,6 @@ func App(version string) cli.App {
 		Usage:   "Smart session manager for the terminal",
 		Commands: []*cli.Command{
 			cmds.List(),
-			cmds.Choose(),
 			cmds.Connect(),
 			cmds.Clone(),
 		},

seshcli/seshcli.go

@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/joshmedeski/sesh/config"
+	"github.com/joshmedeski/sesh/name"
 )
 
 func Determine(choice string, config *config.Config) (s Session, err error) {
@@ -18,15 +19,15 @@ func Determine(choice string, config *config.Config) (s Session, err error) {
 	}
 	s.Path = path
 
-	name := DetermineName(path, config)
-	if name == "" {
+	sessionName := name.DetermineName(path)
+	if sessionName == "" {
 		log.Fatal("Couldn't determine the session name", err)
 		return s, fmt.Errorf(
 			"couldn't determine the session name for %q",
 			choice,
 		)
 	}
-	s.Name = name
+	s.Name = sessionName
 
 	return s, nil
 }

session/determine.go

@@ -3,17 +3,30 @@ package session
 import (
 	"fmt"
 	"os"
+	"reflect"
 
 	"github.com/joshmedeski/sesh/tmux"
 	"github.com/joshmedeski/sesh/zoxide"
 )
 
 type Options struct {
 	HideAttached bool
+	Json         bool
 }
 
-func List(o Options, srcs Srcs) []string {
-	var sessions []string
+func checkAnyTrue(s interface{}) bool {
+	val := reflect.ValueOf(s)
+	for i := 0; i < val.NumField(); i++ {
+		field := val.Field(i)
+		if field.Kind() == reflect.Bool && field.Bool() {
+			return true
+		}
+	}
+	return false
+}
+
+func List(o Options, srcs Srcs) []Session {
+	var sessions []Session
 	anySrcs := checkAnyTrue(srcs)
 
 	tmuxSessions := make([]*tmux.TmuxSession, 0)
@@ -26,11 +39,17 @@ func List(o Options, srcs Srcs) []string {
 			fmt.Println("Error:", err)
 			os.Exit(1)
 		}
-		tmuxSessionNames := make([]string, len(tmuxList))
+		tmuxSessionNames := make([]Session, len(tmuxList))
 		for i, session := range tmuxSessions {
 			// TODO: allow support for connect as well (PrettyName?)
 			// tmuxSessionNames[i] = session.Name + " (" + convert.PathToPretty(session.Path) + ")"
-			tmuxSessionNames[i] = session.Name
+			tmuxSessionNames[i] = Session{
+				Src:      "tmux",
+				Name:     session.Name,
+				Path:     session.Path,
+				Attached: session.Attached,
+				Windows:  session.Windows,
+			}
 		}
 		sessions = append(sessions, tmuxSessionNames...)
 	}
@@ -41,9 +60,14 @@ func List(o Options, srcs Srcs) []string {
 			fmt.Println("Error:", err)
 			os.Exit(1)
 		}
-		zoxideResultNames := make([]string, len(results))
+		zoxideResultNames := make([]Session, len(results))
 		for i, result := range results {
-			zoxideResultNames[i] = result.Name
+			zoxideResultNames[i] = Session{
+				Src:   "zoxide",
+				Name:  result.Name,
+				Path:  result.Path,
+				Score: result.Score,
+			}
 		}
 		sessions = append(sessions, zoxideResultNames...)
 	}

session/list.go

@@ -1,30 +1,15 @@
 package session
 
-import (
-	"reflect"
-)
-
 type Session struct {
-	// tmux or zoxide
-	Src string
-	// The display name
-	Name string
-	// The absolute directory path
-	Path string
+	Src      string  // tmux or zoxide
+	Name     string  // The display name
+	Path     string  // The absolute directory path
+	Score    float64 // The score of the session (from Zoxide)
+	Attached int     // Whether the session is currently attached
+	Windows  int     // The number of windows in the session
 }
 
 type Srcs struct {
 	Tmux   bool
 	Zoxide bool
 }
-
-func checkAnyTrue(s interface{}) bool {
-	val := reflect.ValueOf(s)
-	for i := 0; i < val.NumField(); i++ {
-		field := val.Field(i)
-		if field.Kind() == reflect.Bool && field.Bool() {
-			return true
-		}
-	}
-	return false
-}