Compare commits

..

3 Commits
v0.0.5 ... main

Author SHA1 Message Date
4331b2ac29 added StringNoHead method 2023-01-19 15:40:42 +01:00
Timon Ringwald
5be0ec3905 unicode support added 2022-08-25 22:47:11 +02:00
Timon Ringwald
7f027b08ed removed useless newline 2022-08-25 17:07:37 +02:00
6 changed files with 55 additions and 6 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
table_header_test.go

2
go.mod
View File

@ -6,11 +6,13 @@ require (
git.milar.in/milarin/gmath v0.0.2
git.milar.in/milarin/slices v0.0.3
github.com/fatih/color v1.13.0
github.com/mattn/go-runewidth v0.0.13
)
require (
git.milar.in/milarin/channel v0.0.9 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/rivo/uniseg v0.3.4 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
)

5
go.sum
View File

@ -11,6 +11,11 @@ github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=

View File

@ -60,6 +60,31 @@ func (t *Table) AddRow(row ...interface{}) {
}
}
func (t *Table) StringNoHead() string {
b := new(strings.Builder)
b.WriteRune('┏')
for i, colwidth := range t.colwidth {
b.WriteString(strings.Repeat("━", colwidth))
if i < len(t.colwidth)-1 {
b.WriteRune('┯')
}
}
b.WriteRune('┓')
b.WriteRune('\n')
for i, row := range t.data {
t.printRow(b, row, t.rowheight[i])
if t.rowSep && i < len(t.data)-1 {
t.addNextCellLine(b)
}
}
t.addLastCellLine(b)
return b.String()
}
func (t *Table) String() string {
b := new(strings.Builder)

View File

@ -6,14 +6,21 @@ import (
"git.milar.in/milarin/slices"
)
// TODO FormatHeaderTable is a quick hack
func FormatHeaderTable(header string, table *Table) string {
return formatHeaderTableStr(header, table.String())
}
func FormatHeaderTableNoHead(header string, table *Table) string {
return formatHeaderTableStr(header, table.StringNoHead())
}
// TODO formatHeaderTableStr is a quick hack
// a better solution would be to support nested tables.
// in that case, a header table is just a table with a singe col, single header row and single data row
func FormatHeaderTable(header string, table *Table) string {
func formatHeaderTableStr(header string, tab string) string {
b := new(strings.Builder)
tab := table.String()
splits := strings.Split(tab, "\n")
tabwidth := strLen(splits[0])
@ -31,5 +38,7 @@ func FormatHeaderTable(header string, table *Table) string {
b.WriteString(s)
b.WriteRune('\n')
})
return b.String()
ret := b.String()
return ret[:len(ret)-1]
}

View File

@ -3,6 +3,8 @@ package tprint
import (
"strings"
"unicode"
"github.com/mattn/go-runewidth"
)
func maxLengthStr(a, b string) string {
@ -25,9 +27,10 @@ func strLen(str string) int {
runes := []rune(str)
for i := 0; i < len(runes); i++ {
rn := runes[i]
// skip control sequences
if unicode.IsControl(runes[i]) {
if unicode.IsControl(rn) {
for j := i; j < len(runes)-1 && runes[j] != 'm'; j++ {
i = j
}
@ -35,7 +38,11 @@ func strLen(str string) int {
continue
}
l++
if rn <= 0xFF || rn >= '─' && rn <= '╿' {
l++
} else {
l += runewidth.RuneWidth(rn)
}
}
return l