use of generic ascii table package

2 files changed, 18 insertions, 9 deletions

diff --git a/internal/table/render.go b/internal/table/render.go
index edac866..c7ed46c 100644
--- a/internal/table/render.go
+++ b/internal/table/render.go
@@ -25,9 +25,7 @@ func newRender(tab *Table) render {
 		r.lineLen += len + 3
 	}
 
-	separator.WriteString("+\n")
-	r.separator = separator.String()
-
+	r.separator = tab.sprintf("%s+", separator.String()) + "\n"
 	return r
 }
 
@@ -35,23 +33,26 @@ func (r render) String() string {
 	var sb strings.Builder
 
 	sb.WriteString(r.separator)
-	r.writeRow(&sb, r.tab.headers)
+	sb.WriteString(r.rowString(r.tab.headers))
 
 	sb.WriteString(r.separator)
 	for _, row := range r.tab.rows {
-		r.writeRow(&sb, row)
+		sb.WriteString(r.rowString(row))
 	}
 	sb.WriteString(r.separator)
 
 	return sb.String()
 }
 
-func (r render) writeRow(sb *strings.Builder, row []string) {
+func (r render) rowString(row []string) string {
+	var sb strings.Builder
+
 	for i, col := range row {
 		sb.WriteString(fmt.Sprintf("| %s ", col))
 		for j := len(col); j < r.tab.lengths[i]; j++ {
 			sb.WriteString(" ")
 		}
 	}
-	sb.WriteString("|\n")
+
+	return r.tab.sprintf("%s|", sb.String()) + "\n"
 }
diff --git a/internal/table/table.go b/internal/table/table.go
index 040f50d..7ebeb1b 100644
--- a/internal/table/table.go
+++ b/internal/table/table.go
@@ -3,6 +3,8 @@ package table
 import (
 	"fmt"
 	"strconv"
+
+	"github.com/fatih/color"
 )
 
 type row []string
@@ -10,15 +12,16 @@ type row []string
 type Table struct {
 	headers []string
 	rows    []row
-	lengths []int // Max length of each col
+	lengths []int                                   // Max length of each col
+	sprintf func(format string, args ...any) string // For colored output
 	err     error
 }
 
 func New(args ...any) *Table {
-
 	t := Table{
 		headers: make([]string, 0, len(args)),
 		lengths: make([]int, 0, len(args)),
+		sprintf: fmt.Sprintf,
 	}
 
 	for _, arg := range args {
@@ -30,6 +33,11 @@ func New(args ...any) *Table {
 	return &t
 }
 
+func (t *Table) WithColor(col *color.Color) *Table {
+	t.sprintf = col.Sprintf
+	return t
+}
+
 func (t *Table) Add(args ...any) *Table {
 	if len(args) != len(t.headers) {
 		t.err = fmt.Errorf("Table row (%v) not same length as table headers (%v)", args, t.headers)