Update tab config.

Author: foolin

config.go

@@ -9,6 +9,7 @@ type TabConfig struct {
 	Ellipsis string
 	MinWiths []int
 	MaxWiths []int
+	UseTab   bool
 }
 
 var DefaultConfig = TabConfig{
@@ -18,4 +19,5 @@ var DefaultConfig = TabConfig{
 	Ellipsis: "...",
 	MinWiths: []int{},
 	MaxWiths: []int{},
+	UseTab:   false,
 }

string.go

@@ -3,7 +3,6 @@
 package gotab
 
 import (
-	"fmt"
 	"github.com/mattn/go-runewidth"
 	"regexp"
 	"strings"
@@ -21,35 +20,16 @@ func StrTruncate(s string, w int, tail string) string {
 	return runewidth.Truncate(s, w, tail)
 }
 
-func StrPadding2(s, pad string, width int) string {
-	//fmt.Println("W", StrWidth(s), "L", len(s), "R", utf8.RuneCountInString(s))
-	//sw := StrWidth(s)
-	//rw := utf8.RuneCountInString(s)
-	//if sw > rw {
-	//	width = width - (sw - rw)
-	//}
-	//func Align(s, pad string, width int) string {
-	format := fmt.Sprint("%-", width, "v")
-	//println("format: ", format)
-	return fmt.Sprintf(format, s)
-}
-
-func StrPadding1(s, pad string, width int) string {
-	width += width % 4 //tab
+func Padding(s, pad string, width int) string {
 	sw := StrWidth(s)
 	gap := width - sw
-	tab := "\t"
-	//rw := len(s)
-	//if sw != rw {
-	//	tab = "\t"
-	//}
 	if gap > 0 {
-		return s + strings.Repeat(pad, gap) + tab
+		return s + strings.Repeat(pad, gap)
 	}
-	return s + tab
+	return s
 }
 
-func Padding(s, pad string, width int) string {
+func PaddingTab(s, pad string, width int) string {
 	width = fixTabWidth(width)
 	sw := StrWidth(s)
 	tab := "\t"
@@ -61,5 +41,5 @@ func Padding(s, pad string, width int) string {
 }
 
 func fixTabWidth(width int) int {
-	return width - (width % 4) + 2 //tab fix
+	return width - (width % 4) + 2 //fix tab width
 }

tab.go

@@ -133,7 +133,13 @@ func (r *TabWriter) Print() {
 					value = StrTruncate(value, maxWidth, config.Ellipsis)
 					width = maxWidth
 				}
-				padValue := Padding(value, config.Pad, width)
+				var padValue string
+				if r.Config.UseTab {
+					padValue = PaddingTab(value, config.Pad, width)
+				} else {
+					padValue = Padding(value, config.Pad, width)
+				}
+
 				if ok && n < (size-1) {
 					fmt.Fprintf(writer, " %s %s", padValue, config.Split)
 				} else {

tab_test.go

@@ -11,7 +11,9 @@ const summaryEn = "Gotab is a go library for align text"
 const summaryCn = "Gotab是控制台对齐的go库"
 
 func TestPrintTable(t *testing.T) {
+	println("============================================")
 	writer := NewWriter()
+	writer.Config.Pad = "-"
 	writer.Config.Split = "|"
 	writer.AddLine("Hello, World", summaryEn)
 	writer.AddLine("Hello，世A界B", summaryEn)
@@ -25,13 +27,38 @@ func TestPrintTable(t *testing.T) {
 		{"node4.example.com", "NotReady", "compute", "1.11"},
 	}
 	writer.AddLines(data...)
-	writer.AddDividerWithValue("-----------------")
+	writer.AddDividerWithValue("----")
+	writer.AddLine("Ready", "ABC", summaryEn)
+	writer.AddLine("NotReady", summaryCn, "EDF")
+	writer.Print()
+}
+
+func TestPrintTableUseTab(t *testing.T) {
+	println("============================================")
+	writer := NewWriter()
+	writer.Config.Pad = "-"
+	writer.Config.Split = "|"
+	writer.Config.UseTab = true
+	writer.AddLine("Hello, World", summaryEn)
+	writer.AddLine("Hello，世A界B", summaryEn)
+	writer.AddLine("您好,NI世界ABC", summaryCn)
+	writer.AddDivider()
+	data := [][]any{
+		{"node2.example.com", "Ready", "1.12", "1.12"},
+		{"node3.example.com", "Ready", "compute", "1.13"},
+		{"node4.example.com", "NotReady", "compute", "1.11"},
+		{"node3.example.com", "Ready", "compute", "1.13"},
+		{"node4.example.com", "NotReady", "compute", "1.11"},
+	}
+	writer.AddLines(data...)
+	writer.AddDividerWithValue("----")
 	writer.AddLine("Ready", "ABC", summaryEn)
 	writer.AddLine("NotReady", summaryCn, "EDF")
 	writer.Print()
 }
 
 func TestPrintTable2(t *testing.T) {
+	println("============================================")
 	writer := NewWriter()
 	writer.Config.Split = "|"
 	writer.AddDivider()
@@ -43,13 +70,14 @@ func TestPrintTable2(t *testing.T) {
 		{"node4.example.com", "NotReady", "compute", "1.11"},
 	}
 	writer.AddLines(data...)
-	writer.AddDividerWithValue("-----------------")
+	writer.AddDividerWithValue("----")
 	writer.AddLine("NotReady2", "ABC", summaryEn)
 	writer.AddLine("NotReady2", summaryCn, "EDF")
 	writer.Print()
 }
 
 func TestPrintTable3(t *testing.T) {
+	println("============================================")
 	writer := NewWriter()
 	writer.Config.Split = "|"
 	writer.AddLine("A", summaryEn)
@@ -64,18 +92,15 @@ func TestPrintTable3(t *testing.T) {
 		{"node4.example.com", "NotReady", "compute", "1.11"},
 	}
 	writer.AddLines(data...)
-	writer.AddDividerWithValue("-----------------")
+	writer.AddDividerWithValue("----")
 	writer.AddLine("您好，世界", "ABC", summaryEn)
 	writer.AddLine("Hello, 世界", "ABC", summaryEn)
 	writer.AddLine("A", summaryEn, "Hello World")
-	result := writer.String()
-
-	println("|---------------------------|")
-	println(result)
-	println("|---------------------------|")
+	writer.Print()
 }
 
 func TestPrintTable4(t *testing.T) {
+	println("============================================")
 	config := DefaultConfig
 	config.Split = "|"
 	config.MinWiths = []int{100}
@@ -85,7 +110,7 @@ func TestPrintTable4(t *testing.T) {
 	writer.AddLine("A", summaryEn)
 	writer.AddLine("Hello, 世界", summaryEn)
 	writer.AddLine("您好, 世界", summaryEn)
-	writer.AddDividerWithValue("-----------------")
+	writer.AddDividerWithValue("----")
 	data := [][]any{
 		{"node2.example.com", "Ready", "1.12", "1.12"},
 		{"node3.example.com", "Ready", "compute", "1.13"},
@@ -98,13 +123,11 @@ func TestPrintTable4(t *testing.T) {
 	writer.AddLine("Hello, 世界", "ABC", summaryEn)
 	writer.AddLine("A", summaryEn, "Hello World")
 	result := writer.String()
-
-	println("|---------------------------|")
 	println(result)
-	println("|---------------------------|")
 }
 
 func TestPrintTable5(t *testing.T) {
+	println("============================================")
 	data := [][]any{
 		{"node1.example.com", summaryEn, "A"},
 		{"----"},
@@ -116,13 +139,3 @@ func TestPrintTable5(t *testing.T) {
 	}
 	Print(os.Stdout, data...)
 }
-
-func TestIsDivider(t *testing.T) {
-	var str string = "================="
-	println("Div: ", isDivider(str))
-	println("Val: ", str)
-
-	var div Divider = "================="
-	println("Div: ", isDivider(div))
-	println("Val: ", div)
-}