Updated table writer

Author: djthorpe

cmd/cli/flags.go

@@ -74,6 +74,11 @@ func (flags *Flags) GetString(key string) (string, error) {
 
 func (flags *Flags) Write(v any) error {
 	opts := []writer.TableOpt{}
+
+	// Set terminal options
+	opts = append(opts, TerminalOpts(flags.Output())...)
+
+	// Set output options
 	switch flags.GetOut() {
 	case "text", "txt", "ascii":
 		opts = append(opts, writer.OptText('|', true, 0))

cmd/cli/terminal.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"io"
+	"os"
+
+	// Packages
+	"github.com/mutablelogic/go-client/pkg/writer"
+	"golang.org/x/term"
+)
+
+// TerminalOpts appends appropriate options for terminal output
+// including width of the terminal
+func TerminalOpts(w io.Writer) []writer.TableOpt {
+	result := []writer.TableOpt{}
+	if fh, ok := w.(*os.File); ok {
+		if term.IsTerminal(int(fh.Fd())) {
+			if width, _, err := term.GetSize(int(fh.Fd())); err == nil {
+				if width > 2 {
+					result = append(result, writer.OptTextWidth(uint(width)))
+				}
+			}
+		}
+	}
+	return result
+}

pkg/writer/marshal.go

@@ -1,10 +1,9 @@
 package writer
 
 import (
-	// Packages
-
 	"strconv"
 
+	// Packages
 	. "github.com/djthorpe/go-errors"
 )
 

pkg/writer/opts.go

@@ -1,5 +1,9 @@
 package writer
 
+import (
+	. "github.com/djthorpe/go-errors"
+)
+
 ///////////////////////////////////////////////////////////////////////////////
 // TYPES
 
@@ -37,3 +41,15 @@ func OptText(delim rune, header bool, width uint) TableOpt {
 		return nil
 	}
 }
+
+// Output text table format, with a delimiter, optional header and width
+func OptTextWidth(width uint) TableOpt {
+	return func(m *TableMeta) error {
+		if width > 0 && width < 3 {
+			return ErrBadParameter.With("Invalid text width")
+		} else {
+			m.width = width
+		}
+		return nil
+	}
+}

pkg/writer/table.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	// Packages
-	terminal "golang.org/x/term"
 
 	// Namespace imports
 	. "github.com/djthorpe/go-errors"
@@ -18,8 +17,6 @@ import (
 // TYPES
 
 type TableWriter struct {
-	Width uint
-
 	w io.Writer
 }
 
@@ -75,9 +72,6 @@ func New(w io.Writer) *TableWriter {
 		self.w = w
 	}
 
-	// Set output width
-	self.Width = textWidth(self.w)
-
 	// Return success
 	return self
 }
@@ -105,7 +99,6 @@ func (t *TableWriter) NewMeta(v any, opts ...TableOpt) (*TableMeta, error) {
 	self.delim = ','
 	self.header = true
 	self.nilstr = nilValue
-	self.width = t.Width
 
 	// Set options
 	for _, opt := range opts {
@@ -127,7 +120,6 @@ func (t *TableWriter) NewMeta(v any, opts ...TableOpt) (*TableMeta, error) {
 
 func (t *TableWriter) String() string {
 	str := "<tablewriter"
-	str += " width=" + fmt.Sprint(t.Width)
 	return str + ">"
 }
 
@@ -136,24 +128,13 @@ func (t *TableMeta) String() string {
 	str += " type=" + t.Type.String()
 	str += " columns=" + fmt.Sprint(t.Columns)
 	str += " iterator=" + fmt.Sprint(t.Iterator)
+	str += " width=" + fmt.Sprint(t.width)
 	return str + ">"
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-// Returns the text width of the writer
-func textWidth(w io.Writer) uint {
-	if fh, ok := w.(*os.File); ok {
-		if terminal.IsTerminal(int(fh.Fd())) {
-			if width, _, err := terminal.GetSize(int(fh.Fd())); err == nil {
-				return uint(width)
-			}
-		}
-	}
-	return defaultTextWidth
-}
-
 // Returns a header for CSV output
 func (t *TableMeta) Header() []string {
 	names := make([]string, len(t.Columns))

pkg/writer/writer.go

@@ -80,19 +80,27 @@ func (self *TableWriter) writeCSV(meta *TableMeta, w io.Writer) error {
 func (self *TableWriter) writeText(meta *TableMeta, w io.Writer) error {
 	text := NewTextWriter(meta.Columns, meta.delim)
 
-	// Write header
-	if meta.header {
-		if err := text.Writeln(w, meta.HeaderAny()); err != nil {
-			return err
+	for pass := int(0); pass < 2; pass++ {
+		// Write header
+		if meta.header {
+			if pass == 0 {
+				// TODO: Adjust the column widths
+			} else if err := text.Writeln(w, meta.HeaderAny()); err != nil {
+				return err
+			}
 		}
-	}
 
-	// Write rows
-	for elems := meta.NextRow(); elems != nil; elems = meta.NextRow() {
-		if row, err := meta.toStringAny(elems, false); err != nil {
-			return err
-		} else if err := text.Writeln(w, row); err != nil {
-			return err
+		// Write rows
+		for elems := meta.NextRow(); elems != nil; elems = meta.NextRow() {
+			row, err := meta.toStringAny(elems, false)
+			if err != nil {
+				return err
+			}
+			if pass == 0 {
+				// TODO: Adjust the column widths
+			} else if err := text.Writeln(w, row); err != nil {
+				return err
+			}
 		}
 	}