diff --git a/cfg/config.go b/cfg/config.go index 642f863..83e49a6 100644 --- a/cfg/config.go +++ b/cfg/config.go @@ -28,7 +28,7 @@ import ( ) const DefaultSeparator string = `(\s\s+|\t)` -const Version string = "v1.4.2" +const Version string = "v1.4.3" const MAXPARTS = 2 var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config" diff --git a/lib/common.go b/lib/common.go index daa4315..6a6c929 100644 --- a/lib/common.go +++ b/lib/common.go @@ -34,39 +34,3 @@ func (data *Tabdata) CloneEmpty() Tabdata { return newdata } - -// add a TAB (\t) in front of every cell, but not the first -func (data *Tabdata) TabEntries() [][]string { - newentries := make([][]string, len(data.entries)) - - for rowidx, row := range data.entries { - newentries[rowidx] = make([]string, len(row)) - - for colidx, cell := range row { - switch colidx { - case 0: - newentries[rowidx][colidx] = cell - default: - newentries[rowidx][colidx] = "\t" + cell - } - } - } - - return newentries -} - -// add a TAB (\t) in front of every header, but not the first -func (data *Tabdata) TabHeaders() []string { - newheaders := make([]string, len(data.headers)) - - for colidx, cell := range data.headers { - switch colidx { - case 0: - newheaders[colidx] = cell - default: - newheaders[colidx] = "\t" + cell - } - } - - return newheaders -} diff --git a/lib/printer.go b/lib/printer.go index ee24108..19196e6 100644 --- a/lib/printer.go +++ b/lib/printer.go @@ -196,13 +196,15 @@ Simple ASCII table without any borders etc, just like the input we expect func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) { tableString := &strings.Builder{} + styleTSV := tw.NewSymbolCustom("space").WithColumn("\t") + table := tablewriter.NewTable(tableString, tablewriter.WithRenderer( renderer.NewBlueprint(tw.Rendition{ Borders: tw.BorderNone, - Symbols: tw.NewSymbols(tw.StyleASCII), + Symbols: styleTSV, Settings: tw.Settings{ - Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.Off}, + Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.On}, Lines: tw.Lines{ShowFooterLine: tw.Off, ShowHeaderLine: tw.Off}, }, })), @@ -231,10 +233,10 @@ func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) { ) if !conf.NoHeaders { - table.Header(data.TabHeaders()) + table.Header(data.headers) } - if err := table.Bulk(data.TabEntries()); err != nil { + if err := table.Bulk(data.entries); err != nil { log.Fatalf("Failed to add data to table renderer: %s", err) }