scip/tablizer
1
0
Fork 0
mirror of https://codeberg.org/scip/tablizer.git synced 2025-12-17 04:30:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix excess spaces on normal ascii table output (#66)

Browse Source
This commit is contained in:
T.v.Dein
2025-09-29 20:46:33 +02:00
committed by GitHub
parent 24b66b8a6b
commit 687f4b7bb2
3 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg/config.go
View File

@@ -28,7 +28,7 @@ import (
) )
const DefaultSeparator string = `(\s\s+|\t)` const DefaultSeparator string = `(\s\s+|\t)`
const Version string = "v1.5.3" const Version string = "v1.5.4"
const MAXPARTS = 2 const MAXPARTS = 2
var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config" var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config"

13
lib/printer.go
View File

@@ -204,8 +204,8 @@ func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
Borders: tw.BorderNone, Borders: tw.BorderNone,
Symbols: styleTSV, Symbols: styleTSV,
Settings: tw.Settings{ Settings: tw.Settings{
Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.On}, Separators: tw.SeparatorsNone,
Lines: tw.Lines{ShowFooterLine: tw.Off, ShowHeaderLine: tw.Off}, Lines: tw.LinesNone,
}, },
})), })),
tablewriter.WithConfig(tablewriter.Config{ tablewriter.WithConfig(tablewriter.Config{
@@ -213,23 +213,18 @@ func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
Formatting: tw.CellFormatting{ Formatting: tw.CellFormatting{
AutoFormat: tw.Off, AutoFormat: tw.Off,
}, },
Padding: tw.CellPadding{ Padding: tw.CellPadding{Global: tw.Padding{Left: "", Right: " "}},
Global: tw.Padding{Left: "", Right: ""},
},
}, },
Row: tw.CellConfig{ Row: tw.CellConfig{
Formatting: tw.CellFormatting{ Formatting: tw.CellFormatting{
AutoWrap: tw.WrapNone, AutoWrap: tw.WrapNone,
Alignment: tw.AlignLeft, Alignment: tw.AlignLeft,
}, },
Padding: tw.CellPadding{ Padding: tw.CellPadding{Global: tw.Padding{Right: " "}},
Global: tw.Padding{Left: "", Right: ""},
},
}, },
Debug: true, Debug: true,
}), }),
tablewriter.WithPadding(tw.PaddingNone),
) )
if !conf.NoHeaders { if !conf.NoHeaders {

77
lib/printer_test.go
View File

@@ -77,10 +77,10 @@ var tests = []struct {
numberize: true, numberize: true,
name: "default", name: "default",
expect: ` expect: `
NAME(1) DURATION(2) COUNT(3) WHEN(4) NAME(1) DURATION(2) COUNT(3) WHEN(4)
beta 1d10h5m1s 33 3/1/2014 beta 1d10h5m1s 33 3/1/2014
alpha 4h35m 170 2013-Feb-03 alpha 4h35m 170 2013-Feb-03
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`,
}, },
{ {
mode: cfg.CSV, mode: cfg.CSV,
@@ -173,10 +173,10 @@ DURATION(2): 33d12h
numberize: true, numberize: true,
desc: false, desc: false,
expect: ` expect: `
NAME(1) DURATION(2) COUNT(3) WHEN(4) NAME(1) DURATION(2) COUNT(3) WHEN(4)
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700 ceta 33d12h 9 06/Jan/2008 15:04:05 -0700
beta 1d10h5m1s 33 3/1/2014 beta 1d10h5m1s 33 3/1/2014
alpha 4h35m 170 2013-Feb-03`, alpha 4h35m 170 2013-Feb-03`,
}, },
{ {
name: "sortbycolumn4", name: "sortbycolumn4",
@@ -185,10 +185,10 @@ alpha 4h35m 170 2013-Feb-03`,
desc: false, desc: false,
numberize: true, numberize: true,
expect: ` expect: `
NAME(1) DURATION(2) COUNT(3) WHEN(4) NAME(1) DURATION(2) COUNT(3) WHEN(4)
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700 ceta 33d12h 9 06/Jan/2008 15:04:05 -0700
alpha 4h35m 170 2013-Feb-03 alpha 4h35m 170 2013-Feb-03
beta 1d10h5m1s 33 3/1/2014`, beta 1d10h5m1s 33 3/1/2014`,
}, },
{ {
name: "sortbycolumn2", name: "sortbycolumn2",
@@ -197,10 +197,10 @@ beta 1d10h5m1s 33 3/1/2014`,
numberize: true, numberize: true,
desc: false, desc: false,
expect: ` expect: `
NAME(1) DURATION(2) COUNT(3) WHEN(4) NAME(1) DURATION(2) COUNT(3) WHEN(4)
alpha 4h35m 170 2013-Feb-03 alpha 4h35m 170 2013-Feb-03
beta 1d10h5m1s 33 3/1/2014 beta 1d10h5m1s 33 3/1/2014
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`,
}, },
// ----------------------- UseColumns Tests // ----------------------- UseColumns Tests
@@ -210,44 +210,44 @@ ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`,
numberize: true, numberize: true,
usecolstr: "1,4", usecolstr: "1,4",
expect: ` expect: `
NAME(1) WHEN(4) NAME(1) WHEN(4)
beta 3/1/2014 beta 3/1/2014
alpha 2013-Feb-03 alpha 2013-Feb-03
ceta 06/Jan/2008 15:04:05 -0700`, ceta 06/Jan/2008 15:04:05 -0700`,
}, },
{ {
name: "usecolumns", name: "usecolumns2",
usecol: []int{2}, usecol: []int{2},
numberize: true, numberize: true,
usecolstr: "2", usecolstr: "2",
expect: ` expect: `
DURATION(2) DURATION(2)
1d10h5m1s 1d10h5m1s
4h35m 4h35m
33d12h`, 33d12h`,
}, },
{ {
name: "usecolumns", name: "usecolumns3",
usecol: []int{3}, usecol: []int{3},
numberize: true, numberize: true,
usecolstr: "3", usecolstr: "3",
expect: ` expect: `
COUNT(3) COUNT(3)
33 33
170 170
9`, 9`,
}, },
{ {
name: "usecolumns", name: "usecolumns4",
column: 0, column: 0,
usecol: []int{1, 3}, usecol: []int{1, 3},
numberize: true, numberize: true,
usecolstr: "1,3", usecolstr: "1,3",
expect: ` expect: `
NAME(1) COUNT(3) NAME(1) COUNT(3)
beta 33 beta 33
alpha 170 alpha 170
ceta 9`, ceta 9`,
}, },
{ {
name: "usecolumns", name: "usecolumns",
@@ -255,10 +255,10 @@ ceta 9`,
numberize: true, numberize: true,
usecolstr: "2,4", usecolstr: "2,4",
expect: ` expect: `
DURATION(2) WHEN(4) DURATION(2) WHEN(4)
1d10h5m1s 3/1/2014 1d10h5m1s 3/1/2014
4h35m 2013-Feb-03 4h35m 2013-Feb-03
33d12h 06/Jan/2008 15:04:05 -0700`, 33d12h 06/Jan/2008 15:04:05 -0700`,
}, },
} }
@@ -304,7 +304,8 @@ func TestPrinter(t *testing.T) {
if got != exp { if got != exp {
t.Errorf("not rendered correctly:\n+++ got:\n%s\n+++ want:\n%s", t.Errorf("not rendered correctly:\n+++ got:\n%s\n+++ want:\n%s",
got, exp) strings.ReplaceAll(got, " ", "_"),
strings.ReplaceAll(exp, " ", "_"))
} }
}) })
} }