Hide the directory column on narrow terminal

If the terminal width does not fit all the list columns, then hide "dir" column - unless requested. Signed-off-by: Anders F Björklund <[email protected]>
lima-vm · Jan 5, 2023 · 4b74383 · 4b74383
1 parent ca201a7
commit 4b74383
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/cmd/limactl/list.go b/cmd/limactl/list.go
@@ -3,11 +3,14 @@ package main
 import (
 	"errors"
 	"fmt"
+	"os"
 	"reflect"
 	"sort"
 	"strings"
 
+	"github.com/cheggaaa/pb/v3/termutil"
 	"github.com/lima-vm/lima/pkg/store"
+	"github.com/mattn/go-isatty"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -161,7 +164,17 @@ func listAction(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	return store.PrintInstances(cmd.OutOrStdout(), instances, format, &store.PrintOptions{AllFields: allFields})
+	options := store.PrintOptions{AllFields: allFields}
+	out := cmd.OutOrStdout()
+	if out == os.Stdout {
+		if isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd()) {
+			options.IsTerminal = true
+			if w, err := termutil.TerminalWidth(); err == nil {
+				options.TerminalWidth = w
+			}
+		}
+	}
+	return store.PrintInstances(out, instances, format, &options)
 }
 
 func listBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {

diff --git a/pkg/store/instance.go b/pkg/store/instance.go
@@ -235,6 +235,8 @@ func AddGlobalFields(inst *Instance) (FormatData, error) {
 
 type PrintOptions struct {
 	AllFields bool
+	IsTerminal bool
+	TerminalWidth int
 }
 
 // PrintInstances prints instances in a requested format to a given io.Writer.
@@ -263,7 +265,27 @@ func PrintInstances(w io.Writer, instances []*Instance, format string, options *
 		all := options != nil && options.AllFields
 		hideType := len(types) == 1 && !all
 		hideArch := len(archs) == 1 && !all
-		hideDir := false /* TODO */ && !all
+
+		columns := 1 // NAME
+		columns += 2 // STATUS
+		columns += 2 // SSH
+		if !hideType {
+			columns++ // VMTYPE
+		}
+		if !hideArch {
+			columns++ // ARCH
+		}
+		columns++ // CPUS
+		columns++ // MEMORY
+		columns++ // DISK
+		columns += 2 // DIR
+		hideDir := false
+		if options != nil && options.IsTerminal && !all {
+			width := options.TerminalWidth
+			if width != 0 && columns * 8 > width {
+				hideDir = true
+			}
+		}
 
 		w := tabwriter.NewWriter(w, 4, 8, 4, ' ', 0)
 		fmt.Fprint(w, "NAME\tSTATUS\tSSH")