mirror of
https://codeberg.org/scip/tablizer.git
synced 2025-12-18 13:01:11 +01:00
Compare commits
58 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1658512f07 | |||
| a282e347ec | |||
| ab215156ac | |||
| 675a7dcb52 | |||
| 06c7508c39 | |||
| 4a41833b53 | |||
| 54c9e93301 | |||
| d6ec8ae88b | |||
| 1906c3e43f | |||
| cf5ee09805 | |||
| 5f8b6872ef | |||
| a1de6b9d57 | |||
| 8792c5a40f | |||
| 7ab1a1178a | |||
| 1e44da4f6e | |||
| 59171f0fab | |||
| 8098ccf000 | |||
| 4dc87ac22e | |||
| ef5211e45f | |||
| 1a80e72737 | |||
| 8e765b167f | |||
| 30f4b67538 | |||
| 383b5db47e | |||
| f7d812b372 | |||
| 480f5f617d | |||
| 586e36c181 | |||
|
|
13c789b800 | ||
|
|
81e1394fd2 | ||
|
|
b8099fe389 | ||
|
|
1dc072aa67 | ||
|
|
d92f63ca30 | ||
| 78ccb8f54b | |||
| a29104aeab | |||
|
|
45d9e219a5 | ||
|
|
3eda59beeb | ||
|
|
7ada75c1d6 | ||
| 83d5628430 | |||
| a9bb79b01c | |||
| a718fa388d | |||
| 473feff451 | |||
| 9e2e45715e | |||
| 39609425e5 | |||
| ba2a2e8460 | |||
| 96f7881c16 | |||
|
|
6fccd1287b | ||
| 0f22457961 | |||
| ddfbecaa35 | |||
| 3632de10d7 | |||
| 76b98fb8ad | |||
| f045adf441 | |||
| 811173ddb4 | |||
| 3c910ca08f | |||
| a8c9ede77e | |||
|
|
9eadb941da | ||
|
|
93800f81c1 | ||
|
|
a94a4fd5b0 | ||
| 1acbdbc674 | |||
| 195f685584 |
2
.github/ISSUE_TEMPLATE/bug_report.md
vendored
2
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -7,7 +7,7 @@ assignees: TLINDEN
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Describtion**
|
**Description**
|
||||||
<!-- Please provide a clear and concise description of the issue: -->
|
<!-- Please provide a clear and concise description of the issue: -->
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
.github/ISSUE_TEMPLATE/feature_request.md
vendored
2
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -7,7 +7,7 @@ assignees: TLINDEN
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Describtion**
|
**Description**
|
||||||
<!-- Please provide a clear and concise description of the feature you desire: -->
|
<!-- Please provide a clear and concise description of the feature you desire: -->
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
10
.github/dependabot.yml
vendored
Normal file
10
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "gomod"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "monthly"
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "monthly"
|
||||||
46
.github/workflows/ci.yaml
vendored
46
.github/workflows/ci.yaml
vendored
@@ -4,19 +4,21 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
version: [1.17, 1.18, 1.19]
|
version: ['1.22']
|
||||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
# windows-latest removed, see:
|
||||||
|
# https://github.com/rogpeppe/go-internal/issues/284
|
||||||
|
os: [ubuntu-latest, macos-latest]
|
||||||
name: Build
|
name: Build
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- name: Set up Go 1.18
|
- name: Set up Go ${{ matrix.version }}
|
||||||
uses: actions/setup-go@v3
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.version }}
|
go-version: '${{ matrix.version }}'
|
||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: build
|
- name: build
|
||||||
run: make
|
run: make
|
||||||
@@ -28,31 +30,11 @@ jobs:
|
|||||||
name: lint
|
name: lint
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-go@v3
|
- uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: 1.17
|
go-version: 1.22
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v3
|
uses: golangci/golangci-lint-action@v6
|
||||||
#with:
|
with:
|
||||||
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
|
skip-cache: true
|
||||||
# version: v1.29
|
|
||||||
|
|
||||||
# Optional: working directory, useful for monorepos
|
|
||||||
# working-directory: somedir
|
|
||||||
|
|
||||||
# Optional: golangci-lint command line arguments.
|
|
||||||
# args: --issues-exit-code=0
|
|
||||||
|
|
||||||
# Optional: show only new issues if it's a pull request. The default value is `false`.
|
|
||||||
# only-new-issues: true
|
|
||||||
|
|
||||||
# Optional: if set to true then the all caching functionality will be complete disabled,
|
|
||||||
# takes precedence over all other caching options.
|
|
||||||
# skip-cache: true
|
|
||||||
|
|
||||||
# Optional: if set to true then the action don't cache or restore ~/go/pkg.
|
|
||||||
# skip-pkg-cache: true
|
|
||||||
|
|
||||||
# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
|
|
||||||
# skip-build-cache: true
|
|
||||||
|
|||||||
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
releases
|
||||||
|
tablizer
|
||||||
|
*.out
|
||||||
13
Makefile
13
Makefile
@@ -66,11 +66,10 @@ clean:
|
|||||||
rm -rf $(tool) releases coverage.out
|
rm -rf $(tool) releases coverage.out
|
||||||
|
|
||||||
test:
|
test:
|
||||||
go test -v ./...
|
go test ./... $(OPTS)
|
||||||
bash t/test.sh
|
|
||||||
|
|
||||||
singletest:
|
singletest:
|
||||||
@echo "Call like this: ''make singletest TEST=TestPrepareColumns MOD=lib"
|
@echo "Call like this: 'make singletest TEST=TestPrepareColumns MOD=lib'"
|
||||||
go test -run $(TEST) github.com/tlinden/tablizer/$(MOD)
|
go test -run $(TEST) github.com/tlinden/tablizer/$(MOD)
|
||||||
|
|
||||||
cover-report:
|
cover-report:
|
||||||
@@ -91,3 +90,11 @@ show-versions: buildlocal
|
|||||||
|
|
||||||
goupdate:
|
goupdate:
|
||||||
go get -t -u=patch ./...
|
go get -t -u=patch ./...
|
||||||
|
|
||||||
|
lint:
|
||||||
|
golangci-lint run
|
||||||
|
|
||||||
|
# keep til ireturn
|
||||||
|
lint-full:
|
||||||
|
golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest,forbidigo,gci,godox,goimports,ireturn,stylecheck,testpackage,mirror,nestif,revive,goerr113,gomnd
|
||||||
|
gocritic check -enableAll *.go
|
||||||
|
|||||||
106
README.md
106
README.md
@@ -8,6 +8,49 @@ Tablizer can be used to re-format tabular output of other
|
|||||||
programs. While you could do this using standard unix tools, in some
|
programs. While you could do this using standard unix tools, in some
|
||||||
cases it's a hard job.
|
cases it's a hard job.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
```default
|
||||||
|
Usage:
|
||||||
|
tablizer [regex] [file, ...] [flags]
|
||||||
|
|
||||||
|
Operational Flags:
|
||||||
|
-c, --columns string Only show the speficied columns (separated by ,)
|
||||||
|
-v, --invert-match select non-matching rows
|
||||||
|
-n, --no-numbering Disable header numbering
|
||||||
|
-N, --no-color Disable pattern highlighting
|
||||||
|
-H, --no-headers Disable headers display
|
||||||
|
-s, --separator string Custom field separator
|
||||||
|
-k, --sort-by int Sort by column (default: 1)
|
||||||
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
|
|
||||||
|
Output Flags (mutually exclusive):
|
||||||
|
-X, --extended Enable extended output
|
||||||
|
-M, --markdown Enable markdown table output
|
||||||
|
-O, --orgtbl Enable org-mode table output
|
||||||
|
-S, --shell Enable shell evaluable output
|
||||||
|
-Y, --yaml Enable yaml output
|
||||||
|
-C, --csv Enable CSV output
|
||||||
|
-A, --ascii Default output mode, ascii tabular
|
||||||
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
|
|
||||||
|
Sort Mode Flags (mutually exclusive):
|
||||||
|
-a, --sort-age sort according to age (duration) string
|
||||||
|
-D, --sort-desc Sort in descending order (default: ascending)
|
||||||
|
-i, --sort-numeric sort according to string numerical value
|
||||||
|
-t, --sort-time sort according to time string
|
||||||
|
|
||||||
|
Other Flags:
|
||||||
|
--completion <shell> Generate the autocompletion script for <shell>
|
||||||
|
-f, --config <file> Configuration file (default: ~/.config/tablizer/config)
|
||||||
|
-d, --debug Enable debugging
|
||||||
|
-h, --help help for tablizer
|
||||||
|
-m, --man Display manual page
|
||||||
|
-V, --version Print program version
|
||||||
|
```
|
||||||
|
|
||||||
Let's take this output:
|
Let's take this output:
|
||||||
```
|
```
|
||||||
% kubectl get pods -o wide
|
% kubectl get pods -o wide
|
||||||
@@ -70,8 +113,36 @@ NAME(1) READY(2) STATUS(3) RESTARTS(4) AGE(5)
|
|||||||
repldepl-7bcd8d5b64-q2bf4 1/1 Running 1 (69m ago) 5h26m
|
repldepl-7bcd8d5b64-q2bf4 1/1 Running 1 (69m ago) 5h26m
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Sometimes a filter regex is to broad and you wish to filter only on a
|
||||||
|
particular column. This is possible using `-F`:
|
||||||
|
```
|
||||||
|
% kubectl get pods | tablizer -n -Fname=2
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
repldepl-7bcd8d5b64-q2bf4 1/1 Running 1 (69m ago) 5h26m
|
||||||
|
```
|
||||||
|
|
||||||
|
Here we filtered the `NAME` column for `2`, which would have matched
|
||||||
|
otherwise on all rows.
|
||||||
|
|
||||||
There are more output modes like org-mode (orgtbl) and markdown.
|
There are more output modes like org-mode (orgtbl) and markdown.
|
||||||
|
|
||||||
|
You can also use it to modify certain cells using regular expression
|
||||||
|
matching. For example:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
kubectl get pods | tablizer -n -T4 -R '/ /-/'
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
repldepl-7bcd8d5b64-7zq4l 1/1 Running 1-(69m-ago) 5h26m
|
||||||
|
repldepl-7bcd8d5b64-m48n8 1/1 Running 1-(69m-ago) 5h26m
|
||||||
|
repldepl-7bcd8d5b64-q2bf4 1/1 Running 1-(69m-ago) 5h26m
|
||||||
|
```
|
||||||
|
|
||||||
|
Here, we modified the 4th column (`-T4`) by replacing every space with
|
||||||
|
a dash. If you need to work with `/` characters, you can also use any
|
||||||
|
other separator, for instance: `-R '| |-|'`.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Demo
|
## Demo
|
||||||
|
|
||||||
[](https://asciinema.org/a/9FKc3HPnlg8D2X8otheleEa9t)
|
[](https://asciinema.org/a/9FKc3HPnlg8D2X8otheleEa9t)
|
||||||
@@ -127,6 +198,41 @@ In order to report a bug, unexpected behavior, feature requests
|
|||||||
or to submit a patch, please open an issue on github:
|
or to submit a patch, please open an issue on github:
|
||||||
https://github.com/TLINDEN/tablizer/issues.
|
https://github.com/TLINDEN/tablizer/issues.
|
||||||
|
|
||||||
|
## Prior Art
|
||||||
|
|
||||||
|
When I started with tablizer I was not aware that other tools
|
||||||
|
exist. Here is a non-exhausive list of the ones I find especially
|
||||||
|
awesome:
|
||||||
|
|
||||||
|
### [miller](https://github.com/johnkerl/miller)
|
||||||
|
|
||||||
|
This is a really powerful tool to work with tabular data and it also
|
||||||
|
allows other inputs as json, csv etc. You can filter, manipulate,
|
||||||
|
create pipelines, there's even a programming language builtin to do
|
||||||
|
even more amazing things.
|
||||||
|
|
||||||
|
### [csvq](https://github.com/mithrandie/csvq)
|
||||||
|
|
||||||
|
Csvq allows you to query CSV and TSV data using SQL queries. How nice
|
||||||
|
is that? Highly recommended if you have to work with a large (and
|
||||||
|
wide) dataset and need to apply a complicated set of rules.
|
||||||
|
|
||||||
|
### [goawk](https://github.com/benhoyt/goawk)
|
||||||
|
|
||||||
|
Goawk is a 100% POSIX compliant AWK implementation in GO, which also
|
||||||
|
supports CSV and TSV data as input (using `-i csv` for example). You
|
||||||
|
can apply any kind of awk code to your tabular data, there are no
|
||||||
|
limit to your creativity!
|
||||||
|
|
||||||
|
### [teip](https://github.com/greymd/teip)
|
||||||
|
|
||||||
|
I particularly like teip, it's a real gem. You can use it to drill
|
||||||
|
"holes" into your tabular data and modify these "holes" using small
|
||||||
|
external unix commands such as grep or sed. The possibilities are
|
||||||
|
endless, you can even use teip to modify data inside a hole created by
|
||||||
|
teip. Highly recommended.
|
||||||
|
|
||||||
|
|
||||||
## Copyright and license
|
## Copyright and license
|
||||||
|
|
||||||
This software is licensed under the GNU GENERAL PUBLIC LICENSE version 3.
|
This software is licensed under the GNU GENERAL PUBLIC LICENSE version 3.
|
||||||
|
|||||||
347
cfg/config.go
347
cfg/config.go
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022 Thomas von Dein
|
Copyright © 2022-2024 Thomas von Dein
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -19,38 +19,85 @@ package cfg
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/gookit/color"
|
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/gookit/color"
|
||||||
|
"github.com/hashicorp/hcl/v2/hclsimple"
|
||||||
)
|
)
|
||||||
|
|
||||||
const DefaultSeparator string = `(\s\s+|\t)`
|
const DefaultSeparator string = `(\s\s+|\t)`
|
||||||
const Version string = "v1.0.14"
|
const Version string = "v1.3.0"
|
||||||
|
const MAXPARTS = 2
|
||||||
|
|
||||||
|
var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config"
|
||||||
|
|
||||||
var VERSION string // maintained by -x
|
var VERSION string // maintained by -x
|
||||||
|
|
||||||
|
// public config, set via config file or using defaults
|
||||||
|
type Settings struct {
|
||||||
|
FG string `hcl:"FG"`
|
||||||
|
BG string `hcl:"BG"`
|
||||||
|
HighlightFG string `hcl:"HighlightFG"`
|
||||||
|
HighlightBG string `hcl:"HighlightBG"`
|
||||||
|
NoHighlightFG string `hcl:"NoHighlightFG"`
|
||||||
|
NoHighlightBG string `hcl:"NoHighlightBG"`
|
||||||
|
HighlightHdrFG string `hcl:"HighlightHdrFG"`
|
||||||
|
HighlightHdrBG string `hcl:"HighlightHdrBG"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Transposer struct {
|
||||||
|
Search regexp.Regexp
|
||||||
|
Replace string
|
||||||
|
}
|
||||||
|
|
||||||
|
// internal config
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Debug bool
|
Debug bool
|
||||||
NoNumbering bool
|
NoNumbering bool
|
||||||
Columns string
|
NoHeaders bool
|
||||||
UseColumns []int
|
Columns string
|
||||||
Separator string
|
UseColumns []int
|
||||||
OutputMode int
|
Separator string
|
||||||
InvertMatch bool
|
OutputMode int
|
||||||
Pattern string
|
InvertMatch bool
|
||||||
PatternR *regexp.Regexp
|
Pattern string
|
||||||
|
PatternR *regexp.Regexp
|
||||||
|
UseFuzzySearch bool
|
||||||
|
UseHighlight bool
|
||||||
|
|
||||||
SortMode string
|
SortMode string
|
||||||
SortDescending bool
|
SortDescending bool
|
||||||
SortByColumn int
|
SortByColumn int
|
||||||
|
|
||||||
|
TransposeColumns string // 1,2
|
||||||
|
UseTransposeColumns []int // []int{1,2}
|
||||||
|
Transposers []string // []string{"/ /-/", "/foo/bar/"}
|
||||||
|
UseTransposers []Transposer // {Search: re, Replace: string}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
FIXME: make configurable somehow, config file or ENV
|
FIXME: make configurable somehow, config file or ENV
|
||||||
see https://github.com/gookit/color.
|
see https://github.com/gookit/color.
|
||||||
*/
|
*/
|
||||||
ColorStyle color.Style
|
ColorStyle color.Style
|
||||||
|
HighlightStyle color.Style
|
||||||
|
NoHighlightStyle color.Style
|
||||||
|
HighlightHdrStyle color.Style
|
||||||
|
|
||||||
NoColor bool
|
NoColor bool
|
||||||
|
|
||||||
|
// config file, optional
|
||||||
|
Configfile string
|
||||||
|
|
||||||
|
Settings Settings
|
||||||
|
|
||||||
|
// used for field filtering
|
||||||
|
Rawfilters []string
|
||||||
|
Filters map[string]*regexp.Regexp
|
||||||
|
|
||||||
|
// -r <file>
|
||||||
|
InputFile string
|
||||||
}
|
}
|
||||||
|
|
||||||
// maps outputmode short flags to output mode, ie. -O => -o orgtbl
|
// maps outputmode short flags to output mode, ie. -O => -o orgtbl
|
||||||
@@ -72,7 +119,7 @@ const (
|
|||||||
Shell
|
Shell
|
||||||
Yaml
|
Yaml
|
||||||
CSV
|
CSV
|
||||||
Ascii
|
ASCII
|
||||||
)
|
)
|
||||||
|
|
||||||
// various sort types
|
// various sort types
|
||||||
@@ -83,49 +130,104 @@ type Sortmode struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// default color schemes
|
// default color schemes
|
||||||
func Colors() map[color.Level]map[string]color.Color {
|
func (conf *Config) Colors() map[color.Level]map[string]color.Color {
|
||||||
return map[color.Level]map[string]color.Color{
|
colors := map[color.Level]map[string]color.Color{
|
||||||
color.Level16: {
|
color.Level16: {
|
||||||
"bg": color.BgGreen, "fg": color.FgBlack,
|
"bg": color.BgGreen, "fg": color.FgWhite,
|
||||||
|
"hlbg": color.BgGray, "hlfg": color.FgWhite,
|
||||||
},
|
},
|
||||||
color.Level256: {
|
color.Level256: {
|
||||||
"bg": color.BgLightGreen, "fg": color.FgBlack,
|
"bg": color.BgLightGreen, "fg": color.FgWhite,
|
||||||
|
"hlbg": color.BgLightBlue, "hlfg": color.FgWhite,
|
||||||
},
|
},
|
||||||
color.LevelRgb: {
|
color.LevelRgb: {
|
||||||
// FIXME: maybe use something nicer
|
"bg": color.BgLightGreen, "fg": color.FgWhite,
|
||||||
"bg": color.BgLightGreen, "fg": color.FgBlack,
|
"hlbg": color.BgHiGreen, "hlfg": color.FgWhite,
|
||||||
|
"nohlbg": color.BgWhite, "nohlfg": color.FgLightGreen,
|
||||||
|
"hdrbg": color.BgBlue, "hdrfg": color.FgWhite,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.BG) > 0 {
|
||||||
|
colors[color.Level16]["bg"] = ColorStringToBGColor(conf.Settings.BG)
|
||||||
|
colors[color.Level256]["bg"] = ColorStringToBGColor(conf.Settings.BG)
|
||||||
|
colors[color.LevelRgb]["bg"] = ColorStringToBGColor(conf.Settings.BG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.FG) > 0 {
|
||||||
|
colors[color.Level16]["fg"] = ColorStringToColor(conf.Settings.FG)
|
||||||
|
colors[color.Level256]["fg"] = ColorStringToColor(conf.Settings.FG)
|
||||||
|
colors[color.LevelRgb]["fg"] = ColorStringToColor(conf.Settings.FG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.HighlightBG) > 0 {
|
||||||
|
colors[color.Level16]["hlbg"] = ColorStringToBGColor(conf.Settings.HighlightBG)
|
||||||
|
colors[color.Level256]["hlbg"] = ColorStringToBGColor(conf.Settings.HighlightBG)
|
||||||
|
colors[color.LevelRgb]["hlbg"] = ColorStringToBGColor(conf.Settings.HighlightBG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.HighlightFG) > 0 {
|
||||||
|
colors[color.Level16]["hlfg"] = ColorStringToColor(conf.Settings.HighlightFG)
|
||||||
|
colors[color.Level256]["hlfg"] = ColorStringToColor(conf.Settings.HighlightFG)
|
||||||
|
colors[color.LevelRgb]["hlfg"] = ColorStringToColor(conf.Settings.HighlightFG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.NoHighlightBG) > 0 {
|
||||||
|
colors[color.Level16]["nohlbg"] = ColorStringToBGColor(conf.Settings.NoHighlightBG)
|
||||||
|
colors[color.Level256]["nohlbg"] = ColorStringToBGColor(conf.Settings.NoHighlightBG)
|
||||||
|
colors[color.LevelRgb]["nohlbg"] = ColorStringToBGColor(conf.Settings.NoHighlightBG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.NoHighlightFG) > 0 {
|
||||||
|
colors[color.Level16]["nohlfg"] = ColorStringToColor(conf.Settings.NoHighlightFG)
|
||||||
|
colors[color.Level256]["nohlfg"] = ColorStringToColor(conf.Settings.NoHighlightFG)
|
||||||
|
colors[color.LevelRgb]["nohlfg"] = ColorStringToColor(conf.Settings.NoHighlightFG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.HighlightHdrBG) > 0 {
|
||||||
|
colors[color.Level16]["hdrbg"] = ColorStringToBGColor(conf.Settings.HighlightHdrBG)
|
||||||
|
colors[color.Level256]["hdrbg"] = ColorStringToBGColor(conf.Settings.HighlightHdrBG)
|
||||||
|
colors[color.LevelRgb]["hdrbg"] = ColorStringToBGColor(conf.Settings.HighlightHdrBG)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Settings.HighlightHdrFG) > 0 {
|
||||||
|
colors[color.Level16]["hdrfg"] = ColorStringToColor(conf.Settings.HighlightHdrFG)
|
||||||
|
colors[color.Level256]["hdrfg"] = ColorStringToColor(conf.Settings.HighlightHdrFG)
|
||||||
|
colors[color.LevelRgb]["hdrfg"] = ColorStringToColor(conf.Settings.HighlightHdrFG)
|
||||||
|
}
|
||||||
|
|
||||||
|
return colors
|
||||||
}
|
}
|
||||||
|
|
||||||
// find supported color mode, modifies config based on constants
|
// find supported color mode, modifies config based on constants
|
||||||
func (c *Config) DetermineColormode() {
|
func (conf *Config) DetermineColormode() {
|
||||||
if !isTerminal(os.Stdout) {
|
if !isTerminal(os.Stdout) {
|
||||||
color.Disable()
|
color.Disable()
|
||||||
} else {
|
} else {
|
||||||
level := color.TermColorLevel()
|
level := color.TermColorLevel()
|
||||||
colors := Colors()
|
colors := conf.Colors()
|
||||||
c.ColorStyle = color.New(colors[level]["bg"], colors[level]["fg"])
|
|
||||||
|
conf.ColorStyle = color.New(colors[level]["bg"], colors[level]["fg"])
|
||||||
|
conf.HighlightStyle = color.New(colors[level]["hlbg"], colors[level]["hlfg"])
|
||||||
|
conf.NoHighlightStyle = color.New(colors[level]["nohlbg"], colors[level]["nohlfg"])
|
||||||
|
conf.HighlightHdrStyle = color.New(colors[level]["hdrbg"], colors[level]["hdrfg"])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return true if current terminal is interactive
|
// Return true if current terminal is interactive
|
||||||
func isTerminal(f *os.File) bool {
|
func isTerminal(f *os.File) bool {
|
||||||
o, _ := f.Stat()
|
o, _ := f.Stat()
|
||||||
if (o.Mode() & os.ModeCharDevice) == os.ModeCharDevice {
|
|
||||||
return true
|
return (o.Mode() & os.ModeCharDevice) == os.ModeCharDevice
|
||||||
} else {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// main program version
|
||||||
|
// generated version string, used by -v contains lib.Version on
|
||||||
|
//
|
||||||
|
// main branch, and lib.Version-$branch-$lastcommit-$date on
|
||||||
|
//
|
||||||
|
// development branch
|
||||||
func Getversion() string {
|
func Getversion() string {
|
||||||
// main program version
|
|
||||||
|
|
||||||
// generated version string, used by -v contains lib.Version on
|
|
||||||
// main branch, and lib.Version-$branch-$lastcommit-$date on
|
|
||||||
// development branch
|
|
||||||
|
|
||||||
return fmt.Sprintf("This is tablizer version %s", VERSION)
|
return fmt.Sprintf("This is tablizer version %s", VERSION)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,44 +259,159 @@ func (conf *Config) PrepareModeFlags(flag Modeflag) {
|
|||||||
case flag.C:
|
case flag.C:
|
||||||
conf.OutputMode = CSV
|
conf.OutputMode = CSV
|
||||||
default:
|
default:
|
||||||
conf.OutputMode = Ascii
|
conf.OutputMode = ASCII
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Config) CheckEnv() {
|
func (conf *Config) PrepareFilters() error {
|
||||||
// check for environment vars, command line flags have precedence,
|
conf.Filters = make(map[string]*regexp.Regexp, len(conf.Rawfilters))
|
||||||
// NO_COLOR is being checked by the color module itself.
|
|
||||||
if !c.NoNumbering {
|
for _, filter := range conf.Rawfilters {
|
||||||
_, set := os.LookupEnv("T_NO_HEADER_NUMBERING")
|
parts := strings.Split(filter, "=")
|
||||||
if set {
|
if len(parts) != MAXPARTS {
|
||||||
c.NoNumbering = true
|
return errors.New("filter field and value must be separated by =")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if len(c.Columns) == 0 {
|
reg, err := regexp.Compile(parts[1])
|
||||||
cols := os.Getenv("T_COLUMNS")
|
if err != nil {
|
||||||
if len(cols) > 1 {
|
return fmt.Errorf("failed to compile filter regex for field %s: %w",
|
||||||
c.Columns = cols
|
parts[0], err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
conf.Filters[strings.ToLower(strings.ToLower(parts[0]))] = reg
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Config) ApplyDefaults() {
|
|
||||||
// mode specific defaults
|
|
||||||
if c.OutputMode == Yaml || c.OutputMode == CSV {
|
|
||||||
c.NoNumbering = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Config) PreparePattern(pattern string) error {
|
|
||||||
PatternR, err := regexp.Compile(pattern)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return errors.Unwrap(fmt.Errorf("Regexp pattern %s is invalid: %w", c.Pattern, err))
|
|
||||||
}
|
|
||||||
|
|
||||||
c.PatternR = PatternR
|
|
||||||
c.Pattern = pattern
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check if transposers match transposer columns and prepare transposer structs
|
||||||
|
func (conf *Config) PrepareTransposers() error {
|
||||||
|
if len(conf.Transposers) != len(conf.UseTransposeColumns) {
|
||||||
|
return fmt.Errorf("the number of transposers needs to correspond to the number of transpose columns: %d != %d",
|
||||||
|
len(conf.Transposers), len(conf.UseTransposeColumns))
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, transposer := range conf.Transposers {
|
||||||
|
parts := strings.Split(transposer, string(transposer[0]))
|
||||||
|
if len(parts) != 4 {
|
||||||
|
return fmt.Errorf("transposer function must have the format /regexp/replace-string/")
|
||||||
|
}
|
||||||
|
|
||||||
|
conf.UseTransposers = append(conf.UseTransposers,
|
||||||
|
Transposer{
|
||||||
|
Search: *regexp.MustCompile(parts[1]),
|
||||||
|
Replace: parts[2]},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conf *Config) CheckEnv() {
|
||||||
|
// check for environment vars, command line flags have precedence,
|
||||||
|
// NO_COLOR is being checked by the color module itself.
|
||||||
|
if !conf.NoNumbering {
|
||||||
|
_, set := os.LookupEnv("T_NO_HEADER_NUMBERING")
|
||||||
|
if set {
|
||||||
|
conf.NoNumbering = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Columns) == 0 {
|
||||||
|
cols := os.Getenv("T_COLUMNS")
|
||||||
|
if len(cols) > 1 {
|
||||||
|
conf.Columns = cols
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conf *Config) ApplyDefaults() {
|
||||||
|
// mode specific defaults
|
||||||
|
if conf.OutputMode == Yaml || conf.OutputMode == CSV {
|
||||||
|
conf.NoNumbering = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conf *Config) PreparePattern(pattern string) error {
|
||||||
|
PatternR, err := regexp.Compile(pattern)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("regexp pattern %s is invalid: %w", conf.Pattern, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
conf.PatternR = PatternR
|
||||||
|
conf.Pattern = pattern
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse config file. Ignore if the file doesn't exist but return an
|
||||||
|
// error if it exists but fails to read or parse
|
||||||
|
func (conf *Config) ParseConfigfile() error {
|
||||||
|
path, err := os.Stat(conf.Configfile)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
// ignore non-existent files
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Errorf("failed to stat config file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if path.IsDir() {
|
||||||
|
// ignore non-existent or dirs
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
configstring, err := os.ReadFile(path.Name())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to read config file %s: %w", path.Name(), err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = hclsimple.Decode(
|
||||||
|
path.Name(),
|
||||||
|
configstring,
|
||||||
|
nil,
|
||||||
|
&conf.Settings)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to load configuration file %s: %w",
|
||||||
|
path.Name(), err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// translate color string to internal color value
|
||||||
|
func ColorStringToColor(colorname string) color.Color {
|
||||||
|
for name, color := range color.FgColors {
|
||||||
|
if name == colorname {
|
||||||
|
return color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for name, color := range color.ExFgColors {
|
||||||
|
if name == colorname {
|
||||||
|
return color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return color.Normal
|
||||||
|
}
|
||||||
|
|
||||||
|
// same, for background colors
|
||||||
|
func ColorStringToBGColor(colorname string) color.Color {
|
||||||
|
for name, color := range color.BgColors {
|
||||||
|
if name == colorname {
|
||||||
|
return color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for name, color := range color.ExBgColors {
|
||||||
|
if name == colorname {
|
||||||
|
return color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return color.Normal
|
||||||
|
}
|
||||||
|
|||||||
@@ -34,18 +34,18 @@ func TestPrepareModeFlags(t *testing.T) {
|
|||||||
{Modeflag{O: true}, Orgtbl},
|
{Modeflag{O: true}, Orgtbl},
|
||||||
{Modeflag{Y: true}, Yaml},
|
{Modeflag{Y: true}, Yaml},
|
||||||
{Modeflag{M: true}, Markdown},
|
{Modeflag{M: true}, Markdown},
|
||||||
{Modeflag{}, Ascii},
|
{Modeflag{}, ASCII},
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: use a map for easier printing
|
// FIXME: use a map for easier printing
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("PrepareModeFlags-expect-%d", tt.expect)
|
testname := fmt.Sprintf("PrepareModeFlags-expect-%d", testdata.expect)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := Config{}
|
conf := Config{}
|
||||||
|
|
||||||
c.PrepareModeFlags(tt.flag)
|
conf.PrepareModeFlags(testdata.flag)
|
||||||
if c.OutputMode != tt.expect {
|
if conf.OutputMode != testdata.expect {
|
||||||
t.Errorf("got: %d, expect: %d", c.OutputMode, tt.expect)
|
t.Errorf("got: %d, expect: %d", conf.OutputMode, testdata.expect)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -63,15 +63,15 @@ func TestPrepareSortFlags(t *testing.T) {
|
|||||||
{Sortmode{}, "string"},
|
{Sortmode{}, "string"},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("PrepareSortFlags-expect-%s", tt.expect)
|
testname := fmt.Sprintf("PrepareSortFlags-expect-%s", testdata.expect)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := Config{}
|
conf := Config{}
|
||||||
|
|
||||||
c.PrepareSortFlags(tt.flag)
|
conf.PrepareSortFlags(testdata.flag)
|
||||||
|
|
||||||
if c.SortMode != tt.expect {
|
if conf.SortMode != testdata.expect {
|
||||||
t.Errorf("got: %s, expect: %s", c.SortMode, tt.expect)
|
t.Errorf("got: %s, expect: %s", conf.SortMode, testdata.expect)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -86,15 +86,16 @@ func TestPreparePattern(t *testing.T) {
|
|||||||
{"[a-z", true},
|
{"[a-z", true},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("PreparePattern-pattern-%s-wanterr-%t", tt.pattern, tt.wanterr)
|
testname := fmt.Sprintf("PreparePattern-pattern-%s-wanterr-%t",
|
||||||
|
testdata.pattern, testdata.wanterr)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := Config{}
|
conf := Config{}
|
||||||
|
|
||||||
err := c.PreparePattern(tt.pattern)
|
err := conf.PreparePattern(testdata.pattern)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !tt.wanterr {
|
if !testdata.wanterr {
|
||||||
t.Errorf("PreparePattern returned error: %s", err)
|
t.Errorf("PreparePattern returned error: %s", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
137
cmd/root.go
137
cmd/root.go
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022 Thomas von Dein
|
Copyright © 2022-2024 Thomas von Dein
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -20,23 +20,25 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/spf13/cobra"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"github.com/tlinden/tablizer/lib"
|
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
|
"github.com/tlinden/tablizer/lib"
|
||||||
)
|
)
|
||||||
|
|
||||||
func man() {
|
func man() {
|
||||||
man := exec.Command("less", "-")
|
man := exec.Command("less", "-")
|
||||||
|
|
||||||
var b bytes.Buffer
|
var buffer bytes.Buffer
|
||||||
b.Write([]byte(manpage))
|
|
||||||
|
buffer.Write([]byte(manpage))
|
||||||
|
|
||||||
man.Stdout = os.Stdout
|
man.Stdout = os.Stdout
|
||||||
man.Stdin = &b
|
man.Stdin = &buffer
|
||||||
man.Stderr = os.Stderr
|
man.Stderr = os.Stderr
|
||||||
|
|
||||||
err := man.Run()
|
err := man.Run()
|
||||||
@@ -57,7 +59,15 @@ func completion(cmd *cobra.Command, mode string) error {
|
|||||||
case "powershell":
|
case "powershell":
|
||||||
return cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
|
return cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
|
||||||
default:
|
default:
|
||||||
return errors.New("Invalid shell parameter! Valid ones: bash|zsh|fish|powershell")
|
return errors.New("invalid shell parameter! Valid ones: bash|zsh|fish|powershell")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// we die with exit 1 if there's an error
|
||||||
|
func wrapE(err error) {
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err.Error())
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,63 +85,118 @@ func Execute() {
|
|||||||
Use: "tablizer [regex] [file, ...]",
|
Use: "tablizer [regex] [file, ...]",
|
||||||
Short: "[Re-]tabularize tabular data",
|
Short: "[Re-]tabularize tabular data",
|
||||||
Long: `Manipulate tabular output of other programs`,
|
Long: `Manipulate tabular output of other programs`,
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
if ShowVersion {
|
if ShowVersion {
|
||||||
fmt.Println(cfg.Getversion())
|
fmt.Println(cfg.Getversion())
|
||||||
return nil
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ShowManual {
|
if ShowManual {
|
||||||
man()
|
man()
|
||||||
return nil
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(ShowCompletion) > 0 {
|
if len(ShowCompletion) > 0 {
|
||||||
return completion(cmd, ShowCompletion)
|
wrapE(completion(cmd, ShowCompletion))
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup
|
// Setup
|
||||||
|
wrapE(conf.ParseConfigfile())
|
||||||
|
|
||||||
conf.CheckEnv()
|
conf.CheckEnv()
|
||||||
conf.PrepareModeFlags(modeflag)
|
conf.PrepareModeFlags(modeflag)
|
||||||
conf.PrepareSortFlags(sortmode)
|
conf.PrepareSortFlags(sortmode)
|
||||||
|
|
||||||
|
wrapE(conf.PrepareFilters())
|
||||||
|
|
||||||
conf.DetermineColormode()
|
conf.DetermineColormode()
|
||||||
conf.ApplyDefaults()
|
conf.ApplyDefaults()
|
||||||
|
|
||||||
// actual execution starts here
|
// actual execution starts here
|
||||||
return lib.ProcessFiles(&conf, args)
|
wrapE(lib.ProcessFiles(&conf, args))
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// options
|
// options
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.Debug, "debug", "d", false, "Enable debugging")
|
rootCmd.PersistentFlags().BoolVarP(&conf.Debug, "debug", "d", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.NoNumbering, "no-numbering", "n", false, "Disable header numbering")
|
"Enable debugging")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.NoColor, "no-color", "N", false, "Disable pattern highlighting")
|
rootCmd.PersistentFlags().BoolVarP(&conf.NoNumbering, "no-numbering", "n", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&ShowVersion, "version", "V", false, "Print program version")
|
"Disable header numbering")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.InvertMatch, "invert-match", "v", false, "select non-matching rows")
|
rootCmd.PersistentFlags().BoolVarP(&conf.NoHeaders, "no-headers", "H", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&ShowManual, "man", "m", false, "Display manual page")
|
"Disable header display")
|
||||||
rootCmd.PersistentFlags().StringVarP(&ShowCompletion, "completion", "", "", "Display completion code")
|
rootCmd.PersistentFlags().BoolVarP(&conf.NoColor, "no-color", "N", false,
|
||||||
rootCmd.PersistentFlags().StringVarP(&conf.Separator, "separator", "s", cfg.DefaultSeparator, "Custom field separator")
|
"Disable pattern highlighting")
|
||||||
rootCmd.PersistentFlags().StringVarP(&conf.Columns, "columns", "c", "", "Only show the speficied columns (separated by ,)")
|
rootCmd.PersistentFlags().BoolVarP(&ShowVersion, "version", "V", false,
|
||||||
|
"Print program version")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&conf.InvertMatch, "invert-match", "v", false,
|
||||||
|
"select non-matching rows")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&ShowManual, "man", "m", false,
|
||||||
|
"Display manual page")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&conf.UseFuzzySearch, "fuzzy", "z", false,
|
||||||
|
"Use fuzzy searching")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&conf.UseHighlight, "highlight-lines", "L", false,
|
||||||
|
"Use alternating background colors")
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&ShowCompletion, "completion", "", "",
|
||||||
|
"Display completion code")
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&conf.Separator, "separator", "s", cfg.DefaultSeparator,
|
||||||
|
"Custom field separator")
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&conf.Columns, "columns", "c", "",
|
||||||
|
"Only show the speficied columns (separated by ,)")
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&conf.TransposeColumns, "transpose-columns", "T", "",
|
||||||
|
"Transpose the speficied columns (separated by ,)")
|
||||||
|
|
||||||
// sort options
|
// sort options
|
||||||
rootCmd.PersistentFlags().IntVarP(&conf.SortByColumn, "sort-by", "k", 0, "Sort by column (default: 1)")
|
rootCmd.PersistentFlags().IntVarP(&conf.SortByColumn, "sort-by", "k", 0,
|
||||||
|
"Sort by column (default: 1)")
|
||||||
|
|
||||||
// sort mode, only 1 allowed
|
// sort mode, only 1 allowed
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.SortDescending, "sort-desc", "D", false, "Sort in descending order (default: ascending)")
|
rootCmd.PersistentFlags().BoolVarP(&conf.SortDescending, "sort-desc", "D", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&sortmode.Numeric, "sort-numeric", "i", false, "sort according to string numerical value")
|
"Sort in descending order (default: ascending)")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&sortmode.Time, "sort-time", "t", false, "sort according to time string")
|
rootCmd.PersistentFlags().BoolVarP(&sortmode.Numeric, "sort-numeric", "i", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&sortmode.Age, "sort-age", "a", false, "sort according to age (duration) string")
|
"sort according to string numerical value")
|
||||||
rootCmd.MarkFlagsMutuallyExclusive("sort-numeric", "sort-time", "sort-age")
|
rootCmd.PersistentFlags().BoolVarP(&sortmode.Time, "sort-time", "t", false,
|
||||||
|
"sort according to time string")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&sortmode.Age, "sort-age", "a", false,
|
||||||
|
"sort according to age (duration) string")
|
||||||
|
rootCmd.MarkFlagsMutuallyExclusive("sort-numeric", "sort-time",
|
||||||
|
"sort-age")
|
||||||
|
|
||||||
// output flags, only 1 allowed
|
// output flags, only 1 allowed
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.X, "extended", "X", false, "Enable extended output")
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.X, "extended", "X", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.M, "markdown", "M", false, "Enable markdown table output")
|
"Enable extended output")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.O, "orgtbl", "O", false, "Enable org-mode table output")
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.M, "markdown", "M", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.S, "shell", "S", false, "Enable shell mode output")
|
"Enable markdown table output")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.Y, "yaml", "Y", false, "Enable yaml output")
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.O, "orgtbl", "O", false,
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.C, "csv", "C", false, "Enable CSV output")
|
"Enable org-mode table output")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&modeflag.A, "ascii", "A", false, "Enable ASCII output (default)")
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.S, "shell", "S", false,
|
||||||
rootCmd.MarkFlagsMutuallyExclusive("extended", "markdown", "orgtbl", "shell", "yaml", "csv")
|
"Enable shell mode output")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.Y, "yaml", "Y", false,
|
||||||
|
"Enable yaml output")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.C, "csv", "C", false,
|
||||||
|
"Enable CSV output")
|
||||||
|
rootCmd.PersistentFlags().BoolVarP(&modeflag.A, "ascii", "A", false,
|
||||||
|
"Enable ASCII output (default)")
|
||||||
|
rootCmd.MarkFlagsMutuallyExclusive("extended", "markdown", "orgtbl",
|
||||||
|
"shell", "yaml", "csv")
|
||||||
|
|
||||||
|
// config file
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&conf.Configfile, "config", "f", cfg.DefaultConfigfile,
|
||||||
|
"config file (default: ~/.config/tablizer/config)")
|
||||||
|
|
||||||
|
// filters
|
||||||
|
rootCmd.PersistentFlags().StringArrayVarP(&conf.Rawfilters,
|
||||||
|
"filter", "F", nil, "Filter by field (field=regexp)")
|
||||||
|
rootCmd.PersistentFlags().StringArrayVarP(&conf.Transposers,
|
||||||
|
"regex-transposer", "R", nil, "apply /search/replace/ regexp to fields given in -T")
|
||||||
|
|
||||||
|
// input
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&conf.InputFile, "read-file", "r", "",
|
||||||
|
"Read input data from file")
|
||||||
|
|
||||||
rootCmd.SetUsageTemplate(strings.TrimSpace(usage) + "\n")
|
rootCmd.SetUsageTemplate(strings.TrimSpace(usage) + "\n")
|
||||||
|
|
||||||
|
|||||||
196
cmd/tablizer.go
196
cmd/tablizer.go
@@ -9,34 +9,41 @@ SYNOPSIS
|
|||||||
tablizer [regex] [file, ...] [flags]
|
tablizer [regex] [file, ...] [flags]
|
||||||
|
|
||||||
Operational Flags:
|
Operational Flags:
|
||||||
-c, --columns string Only show the speficied columns (separated by ,)
|
-c, --columns string Only show the speficied columns (separated by ,)
|
||||||
-v, --invert-match select non-matching rows
|
-v, --invert-match select non-matching rows
|
||||||
-n, --no-numbering Disable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-s, --separator string Custom field separator
|
-H, --no-headers Disable headers display
|
||||||
-k, --sort-by int Sort by column (default: 1)
|
-s, --separator string Custom field separator
|
||||||
|
-k, --sort-by int Sort by column (default: 1)
|
||||||
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
-M, --markdown Enable markdown table output
|
-M, --markdown Enable markdown table output
|
||||||
-O, --orgtbl Enable org-mode table output
|
-O, --orgtbl Enable org-mode table output
|
||||||
-S, --shell Enable shell evaluable ouput
|
-S, --shell Enable shell evaluable output
|
||||||
-Y, --yaml Enable yaml output
|
-Y, --yaml Enable yaml output
|
||||||
-C, --csv Enable CSV output
|
-C, --csv Enable CSV output
|
||||||
-A, --ascii Default output mode, ascii tabular
|
-A, --ascii Default output mode, ascii tabular
|
||||||
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
|
|
||||||
Sort Mode Flags (mutually exclusive):
|
Sort Mode Flags (mutually exclusive):
|
||||||
-a, --sort-age sort according to age (duration) string
|
-a, --sort-age sort according to age (duration) string
|
||||||
-D, --sort-desc Sort in descending order (default: ascending)
|
-D, --sort-desc Sort in descending order (default: ascending)
|
||||||
-i, --sort-numeric sort according to string numerical value
|
-i, --sort-numeric sort according to string numerical value
|
||||||
-t, --sort-time sort according to time string
|
-t, --sort-time sort according to time string
|
||||||
|
|
||||||
Other Flags:
|
Other Flags:
|
||||||
--completion <shell> Generate the autocompletion script for <shell>
|
--completion <shell> Generate the autocompletion script for <shell>
|
||||||
-d, --debug Enable debugging
|
-f, --config <file> Configuration file (default: ~/.config/tablizer/config)
|
||||||
-h, --help help for tablizer
|
-d, --debug Enable debugging
|
||||||
-m, --man Display manual page
|
-h, --help help for tablizer
|
||||||
-v, --version Print program version
|
-m, --man Display manual page
|
||||||
|
-V, --version Print program version
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
Many programs generate tabular output. But sometimes you need to
|
Many programs generate tabular output. But sometimes you need to
|
||||||
@@ -87,6 +94,11 @@ DESCRIPTION
|
|||||||
|
|
||||||
The numbering can be suppressed by using the -n option.
|
The numbering can be suppressed by using the -n option.
|
||||||
|
|
||||||
|
By default tablizer shows a header containing the names of each column.
|
||||||
|
This can be disabled using the -H option. Be aware that this only
|
||||||
|
affects tabular output modes. Shell, Extended, Yaml and CSV output modes
|
||||||
|
always use the column names.
|
||||||
|
|
||||||
By default, if a pattern has been speficied, matches will be
|
By default, if a pattern has been speficied, matches will be
|
||||||
highlighted. You can disable this behavior with the -N option.
|
highlighted. You can disable this behavior with the -N option.
|
||||||
|
|
||||||
@@ -108,7 +120,7 @@ DESCRIPTION
|
|||||||
Finally the -d option enables debugging output which is mostly useful
|
Finally the -d option enables debugging output which is mostly useful
|
||||||
for the developer.
|
for the developer.
|
||||||
|
|
||||||
PATTERNS
|
PATTERNS AND FILTERING
|
||||||
You can reduce the rows being displayed by using a regular expression
|
You can reduce the rows being displayed by using a regular expression
|
||||||
pattern. The regexp is PCRE compatible, refer to the syntax cheat sheet
|
pattern. The regexp is PCRE compatible, refer to the syntax cheat sheet
|
||||||
here: <https://github.com/google/re2/wiki/Syntax>. If you want to read a
|
here: <https://github.com/google/re2/wiki/Syntax>. If you want to read a
|
||||||
@@ -132,6 +144,23 @@ DESCRIPTION
|
|||||||
|
|
||||||
kubectl get pods -A | tablizer "(?i)account"
|
kubectl get pods -A | tablizer "(?i)account"
|
||||||
|
|
||||||
|
You can use the experimental fuzzy search feature by providing the
|
||||||
|
option -z, in which case the pattern is regarded as a fuzzy search term,
|
||||||
|
not a regexp.
|
||||||
|
|
||||||
|
Sometimes you want to filter by one or more columns. You can do that
|
||||||
|
using the -F option. The option can be specified multiple times and has
|
||||||
|
the following format:
|
||||||
|
|
||||||
|
fieldname=regexp
|
||||||
|
|
||||||
|
Fieldnames (== columns headers) are case insensitive.
|
||||||
|
|
||||||
|
If you specify more than one filter, both filters have to match (AND
|
||||||
|
operation).
|
||||||
|
|
||||||
|
If the option -v is specified, the filtering is inverted.
|
||||||
|
|
||||||
COLUMNS
|
COLUMNS
|
||||||
The parameter -c can be used to specify, which columns to display. By
|
The parameter -c can be used to specify, which columns to display. By
|
||||||
default tablizer numerizes the header names and these numbers can be
|
default tablizer numerizes the header names and these numbers can be
|
||||||
@@ -158,6 +187,44 @@ DESCRIPTION
|
|||||||
|
|
||||||
where "C" is our regexp which matches CMD.
|
where "C" is our regexp which matches CMD.
|
||||||
|
|
||||||
|
If a column specifier doesn't look like a regular expression, matching
|
||||||
|
against header fields will be case insensitive. So, if you have a field
|
||||||
|
with the name "ID" then these will all match: "-c id", "-c Id". The same
|
||||||
|
rule applies to the options "-T" and "-F".
|
||||||
|
|
||||||
|
TRANSPOSE FIELDS USING REGEXPS
|
||||||
|
You can manipulate field contents using regular expressions. You have to
|
||||||
|
tell tablizer which field[s] to operate on using the option "-T" and the
|
||||||
|
search/replace pattern using "-R". The number of columns and patterns
|
||||||
|
must match.
|
||||||
|
|
||||||
|
A search/replace pattern consists of the following elements:
|
||||||
|
|
||||||
|
/search-regexp/replace-string/
|
||||||
|
|
||||||
|
The separator can be any valid character. Especially if you want to use
|
||||||
|
a regexp containing the "/" character, eg:
|
||||||
|
|
||||||
|
|search-regexp|replace-string|
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
cat t/testtable2
|
||||||
|
NAME DURATION
|
||||||
|
x 10
|
||||||
|
a 100
|
||||||
|
z 0
|
||||||
|
u 4
|
||||||
|
k 6
|
||||||
|
|
||||||
|
cat t/testtable2 | tablizer -T2 -R '/^\d/4/' -n
|
||||||
|
NAME DURATION
|
||||||
|
x 40
|
||||||
|
a 400
|
||||||
|
z 4
|
||||||
|
u 4
|
||||||
|
k 4
|
||||||
|
|
||||||
OUTPUT MODES
|
OUTPUT MODES
|
||||||
There might be cases when the tabular output of a program is way too
|
There might be cases when the tabular output of a program is way too
|
||||||
large for your current terminal but you still need to see every column.
|
large for your current terminal but you still need to see every column.
|
||||||
@@ -246,6 +313,36 @@ DESCRIPTION
|
|||||||
|
|
||||||
and source this file from your PowerShell profile.
|
and source this file from your PowerShell profile.
|
||||||
|
|
||||||
|
CONFIGURATION AND COLORS
|
||||||
|
YOu can put certain configuration values into a configuration file in
|
||||||
|
HCL format. By default tablizer looks for
|
||||||
|
"$HOME/.config/tablizer/config", but you can provide one using the
|
||||||
|
parameter "-f".
|
||||||
|
|
||||||
|
In the configuration the following variables can be defined:
|
||||||
|
|
||||||
|
BG = "lightGreen"
|
||||||
|
FG = "white"
|
||||||
|
HighlightBG = "lightGreen"
|
||||||
|
HighlightFG = "white"
|
||||||
|
NoHighlightBG = "white"
|
||||||
|
NoHighlightFG = "lightGreen"
|
||||||
|
HighlightHdrBG = "red"
|
||||||
|
HighlightHdrFG = "white"
|
||||||
|
|
||||||
|
The following color definitions are available:
|
||||||
|
|
||||||
|
black, blue, cyan, darkGray, default, green, lightBlue, lightCyan,
|
||||||
|
lightGreen, lightMagenta, lightRed, lightWhite, lightYellow, magenta,
|
||||||
|
red, white, yellow
|
||||||
|
|
||||||
|
The Variables FG and BG are being used to highlight matches. The other
|
||||||
|
*FG and *BG variables are for colored table output (enabled with the
|
||||||
|
"-L" parameter).
|
||||||
|
|
||||||
|
Colorization can be turned off completely either by setting the
|
||||||
|
parameter "-N" or the environment variable NO_COLOR to a true value.
|
||||||
|
|
||||||
BUGS
|
BUGS
|
||||||
In order to report a bug, unexpected behavior, feature requests or to
|
In order to report a bug, unexpected behavior, feature requests or to
|
||||||
submit a patch, please open an issue on github:
|
submit a patch, please open an issue on github:
|
||||||
@@ -255,7 +352,7 @@ LICENSE
|
|||||||
This software is licensed under the GNU GENERAL PUBLIC LICENSE version
|
This software is licensed under the GNU GENERAL PUBLIC LICENSE version
|
||||||
3.
|
3.
|
||||||
|
|
||||||
Copyright (c) 2023 by Thomas von Dein
|
Copyright (c) 2022-2024 by Thomas von Dein
|
||||||
|
|
||||||
This software uses the following GO modules:
|
This software uses the following GO modules:
|
||||||
|
|
||||||
@@ -289,34 +386,41 @@ Usage:
|
|||||||
tablizer [regex] [file, ...] [flags]
|
tablizer [regex] [file, ...] [flags]
|
||||||
|
|
||||||
Operational Flags:
|
Operational Flags:
|
||||||
-c, --columns string Only show the speficied columns (separated by ,)
|
-c, --columns string Only show the speficied columns (separated by ,)
|
||||||
-v, --invert-match select non-matching rows
|
-v, --invert-match select non-matching rows
|
||||||
-n, --no-numbering Disable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-s, --separator string Custom field separator
|
-H, --no-headers Disable headers display
|
||||||
-k, --sort-by int Sort by column (default: 1)
|
-s, --separator string Custom field separator
|
||||||
|
-k, --sort-by int Sort by column (default: 1)
|
||||||
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
-M, --markdown Enable markdown table output
|
-M, --markdown Enable markdown table output
|
||||||
-O, --orgtbl Enable org-mode table output
|
-O, --orgtbl Enable org-mode table output
|
||||||
-S, --shell Enable shell evaluable ouput
|
-S, --shell Enable shell evaluable output
|
||||||
-Y, --yaml Enable yaml output
|
-Y, --yaml Enable yaml output
|
||||||
-C, --csv Enable CSV output
|
-C, --csv Enable CSV output
|
||||||
-A, --ascii Default output mode, ascii tabular
|
-A, --ascii Default output mode, ascii tabular
|
||||||
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
|
|
||||||
Sort Mode Flags (mutually exclusive):
|
Sort Mode Flags (mutually exclusive):
|
||||||
-a, --sort-age sort according to age (duration) string
|
-a, --sort-age sort according to age (duration) string
|
||||||
-D, --sort-desc Sort in descending order (default: ascending)
|
-D, --sort-desc Sort in descending order (default: ascending)
|
||||||
-i, --sort-numeric sort according to string numerical value
|
-i, --sort-numeric sort according to string numerical value
|
||||||
-t, --sort-time sort according to time string
|
-t, --sort-time sort according to time string
|
||||||
|
|
||||||
Other Flags:
|
Other Flags:
|
||||||
--completion <shell> Generate the autocompletion script for <shell>
|
--completion <shell> Generate the autocompletion script for <shell>
|
||||||
-d, --debug Enable debugging
|
-f, --config <file> Configuration file (default: ~/.config/tablizer/config)
|
||||||
-h, --help help for tablizer
|
-d, --debug Enable debugging
|
||||||
-m, --man Display manual page
|
-h, --help help for tablizer
|
||||||
-v, --version Print program version
|
-m, --man Display manual page
|
||||||
|
-V, --version Print program version
|
||||||
|
|
||||||
|
|
||||||
`
|
`
|
||||||
|
|||||||
12
config.hcl
Normal file
12
config.hcl
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# supported colors:
|
||||||
|
# black, blue, cyan, darkGray, default, green, lightBlue, lightCyan,
|
||||||
|
# lightGreen, lightMagenta, lightRed, lightWhite, lightYellow,
|
||||||
|
# magenta, red, white, yellow
|
||||||
|
BG = "lightGreen"
|
||||||
|
FG = "white"
|
||||||
|
HighlightBG = "lightGreen"
|
||||||
|
HighlightFG = "white"
|
||||||
|
NoHighlightBG = "white"
|
||||||
|
NoHighlightFG = "lightGreen"
|
||||||
|
HighlightHdrBG = "red"
|
||||||
|
HighlightHdrFG = "white"
|
||||||
43
go.mod
43
go.mod
@@ -1,24 +1,45 @@
|
|||||||
module github.com/tlinden/tablizer
|
module github.com/tlinden/tablizer
|
||||||
|
|
||||||
go 1.18
|
go 1.22
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/alecthomas/repr v0.1.1
|
github.com/alecthomas/repr v0.4.0
|
||||||
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
|
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
|
||||||
github.com/gookit/color v1.5.2
|
github.com/glycerine/zygomys v5.1.2+incompatible
|
||||||
|
github.com/gookit/color v1.5.4
|
||||||
|
github.com/hashicorp/hcl/v2 v2.22.0
|
||||||
|
github.com/lithammer/fuzzysearch v1.1.8
|
||||||
github.com/olekukonko/tablewriter v0.0.5
|
github.com/olekukonko/tablewriter v0.0.5
|
||||||
github.com/spf13/cobra v1.6.1
|
github.com/spf13/cobra v1.8.1
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/inconshreveable/mousetrap v1.0.1 // indirect
|
github.com/agext/levenshtein v1.2.3 // indirect
|
||||||
github.com/mattn/go-runewidth v0.0.14 // indirect
|
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
|
||||||
|
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
|
||||||
// force release. > 0.4. doesnt build everywhere, see:
|
github.com/glycerine/blake2b v0.0.0-20151022103502-3c8c640cd7be // indirect
|
||||||
// https://github.com/TLINDEN/tablizer/actions/runs/3396457307/jobs/5647544615
|
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
|
||||||
github.com/rivo/uniseg v0.2.0 // indirect
|
github.com/glycerine/greenpack v5.1.1+incompatible // indirect
|
||||||
|
github.com/glycerine/liner v0.0.0-20160121172638-72909af234e0 // indirect
|
||||||
|
github.com/google/go-cmp v0.6.0 // indirect
|
||||||
|
github.com/gopherjs/gopherjs v1.17.2 // indirect
|
||||||
|
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||||
|
github.com/jtolds/gls v4.20.0+incompatible // indirect
|
||||||
|
github.com/mattn/go-runewidth v0.0.16 // indirect
|
||||||
|
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
|
||||||
|
github.com/philhofer/fwd v1.1.2 // indirect
|
||||||
|
github.com/rivo/uniseg v0.2.0 // indirect
|
||||||
|
github.com/rogpeppe/go-internal v1.13.1 // indirect
|
||||||
|
github.com/shurcooL/go v0.0.0-20230706063926-5fe729b41b3a // indirect
|
||||||
|
github.com/shurcooL/go-goon v1.0.0 // indirect
|
||||||
github.com/spf13/pflag v1.0.5 // indirect
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
|
github.com/tinylib/msgp v1.1.9 // indirect
|
||||||
|
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/sys v0.1.0 // indirect
|
github.com/zclconf/go-cty v1.13.3 // indirect
|
||||||
|
golang.org/x/mod v0.18.0 // indirect
|
||||||
|
golang.org/x/sys v0.21.0 // indirect
|
||||||
|
golang.org/x/text v0.11.0 // indirect
|
||||||
|
golang.org/x/tools v0.22.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
133
go.sum
133
go.sum
@@ -1,45 +1,138 @@
|
|||||||
github.com/alecthomas/repr v0.1.1 h1:87P60cSmareLAxMc4Hro0r2RBY4ROm0dYwkJNpS4pPs=
|
github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
|
||||||
github.com/alecthomas/repr v0.1.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
|
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
|
||||||
|
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
|
||||||
|
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
|
||||||
|
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
|
||||||
|
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
|
||||||
|
github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
|
||||||
|
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
|
||||||
|
github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
|
||||||
|
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
|
||||||
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
|
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
|
||||||
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
|
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/glycerine/blake2b v0.0.0-20151022103502-3c8c640cd7be h1:XBJdPGgA3qqhW+p9CANCAVdF7ZIXdu3pZAkypMkKAjE=
|
||||||
github.com/gookit/color v1.5.2 h1:uLnfXcaFjlrDnQDT+NCBcfhrXqYTx/rcCa6xn01Y8yI=
|
github.com/glycerine/blake2b v0.0.0-20151022103502-3c8c640cd7be/go.mod h1:OSCrScrFAjcBObrulk6BEQlytA462OkG1UGB5NYj9kE=
|
||||||
github.com/gookit/color v1.5.2/go.mod h1:w8h4bGiHeeBpvQVePTutdbERIUf3oJE5lZ8HM0UgXyg=
|
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8=
|
||||||
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
|
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
|
||||||
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
github.com/glycerine/greenpack v5.1.1+incompatible h1:fDr9i6MkSGZmAy4VXPfJhW+SyK2/LNnzIp5nHyDiaIM=
|
||||||
|
github.com/glycerine/greenpack v5.1.1+incompatible/go.mod h1:us0jVISAESGjsEuLlAfCd5nkZm6W6WQF18HPuOecIg4=
|
||||||
|
github.com/glycerine/liner v0.0.0-20160121172638-72909af234e0 h1:4ZegphJXBTc4uFQ08UVoWYmQXorGa+ipXetUj83sMBc=
|
||||||
|
github.com/glycerine/liner v0.0.0-20160121172638-72909af234e0/go.mod h1:AqJLs6UeoC65dnHxyCQ6MO31P5STpjcmgaANAU+No8Q=
|
||||||
|
github.com/glycerine/zygomys v5.1.2+incompatible h1:jmcdmA3XPxgfOunAXFpipE9LQoUL6eX6d2mhYyjV4GE=
|
||||||
|
github.com/glycerine/zygomys v5.1.2+incompatible/go.mod h1:i3SPKZpmy9dwF/3iWrXJ/ZLyzZucegwypwOmqRkUUaQ=
|
||||||
|
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
|
||||||
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
|
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
|
||||||
|
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
|
||||||
|
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
|
||||||
|
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
|
||||||
|
github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M=
|
||||||
|
github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
|
||||||
|
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||||
|
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||||
|
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
|
||||||
|
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||||
|
github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
|
||||||
|
github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
|
||||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||||
|
github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg=
|
||||||
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
|
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
|
||||||
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
|
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||||
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||||
|
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
|
||||||
|
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
|
||||||
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||||
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||||
|
github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
|
||||||
|
github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
|
||||||
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
|
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
|
||||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
|
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||||
|
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
|
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
|
||||||
github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
|
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 h1:aSISeOcal5irEhJd1M+IrApc0PdcN7e7Aj4yuEnOrfQ=
|
||||||
github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
|
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
|
||||||
|
github.com/shurcooL/go v0.0.0-20230706063926-5fe729b41b3a h1:ZHfoO7ZJhws9NU1kzZhStUnnVQiPtDe1PzpUnc6HirU=
|
||||||
|
github.com/shurcooL/go v0.0.0-20230706063926-5fe729b41b3a/go.mod h1:DNrlr0AR9NsHD/aoc2pPeu4uSBZ/71yCHkR42yrzW3M=
|
||||||
|
github.com/shurcooL/go-goon v1.0.0 h1:BCQPvxGkHHJ4WpBO4m/9FXbITVIsvAm/T66cCcCGI7E=
|
||||||
|
github.com/shurcooL/go-goon v1.0.0/go.mod h1:2wTHMsGo7qnpmqA8ADYZtP4I1DD94JpXGQ3Dxq2YQ5w=
|
||||||
|
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
|
||||||
|
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
|
||||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||||
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
|
github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU=
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k=
|
||||||
|
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
|
||||||
|
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||||
|
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
|
||||||
|
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||||
|
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
|
||||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
|
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
||||||
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0=
|
||||||
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
|
||||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
github.com/zclconf/go-cty v1.13.3 h1:m+b9q3YDbg6Bec5rr+KGy1MzEVzY/jC2X+YX4yqKtHI=
|
||||||
|
github.com/zclconf/go-cty v1.13.3/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
|
||||||
|
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
|
||||||
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
|
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
|
||||||
|
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
|
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
|
||||||
|
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
|
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
|
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
|
||||||
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
||||||
|
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||||
|
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
|
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
|
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
|
||||||
|
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||||
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
|
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
|
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
|
||||||
|
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
|
||||||
|
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
|
||||||
|
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
|
||||||
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022 Thomas von Dein
|
Copyright © 2022-2024 Thomas von Dein
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -24,3 +24,13 @@ type Tabdata struct {
|
|||||||
headers []string // [ "ID", "NAME", ...]
|
headers []string // [ "ID", "NAME", ...]
|
||||||
entries [][]string
|
entries [][]string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (data *Tabdata) CloneEmpty() Tabdata {
|
||||||
|
newdata := Tabdata{
|
||||||
|
maxwidthHeader: data.maxwidthHeader,
|
||||||
|
columns: data.columns,
|
||||||
|
headers: data.headers,
|
||||||
|
}
|
||||||
|
|
||||||
|
return newdata
|
||||||
|
}
|
||||||
|
|||||||
154
lib/filter.go
Normal file
154
lib/filter.go
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
/*
|
||||||
|
Copyright © 2022-2024 Thomas von Dein
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lib
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"io"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/lithammer/fuzzysearch/fuzzy"
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* [!]Match a line, use fuzzy search for normal pattern strings and
|
||||||
|
* regexp otherwise.
|
||||||
|
*/
|
||||||
|
func matchPattern(conf cfg.Config, line string) bool {
|
||||||
|
if conf.UseFuzzySearch {
|
||||||
|
return fuzzy.MatchFold(conf.Pattern, line)
|
||||||
|
}
|
||||||
|
|
||||||
|
return conf.PatternR.MatchString(line)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Filter parsed data by fields. The filter is positive, so if one or
|
||||||
|
* more filters match on a row, it will be kept, otherwise it will be
|
||||||
|
* excluded.
|
||||||
|
*/
|
||||||
|
func FilterByFields(conf cfg.Config, data *Tabdata) (*Tabdata, bool, error) {
|
||||||
|
if len(conf.Filters) == 0 {
|
||||||
|
// no filters, no checking
|
||||||
|
return nil, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
newdata := data.CloneEmpty()
|
||||||
|
|
||||||
|
for _, row := range data.entries {
|
||||||
|
keep := true
|
||||||
|
|
||||||
|
for idx, header := range data.headers {
|
||||||
|
if !Exists(conf.Filters, strings.ToLower(header)) {
|
||||||
|
// do not filter by unspecified field
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if !conf.Filters[strings.ToLower(header)].MatchString(row[idx]) {
|
||||||
|
// there IS a filter, but it doesn't match
|
||||||
|
keep = false
|
||||||
|
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if keep == !conf.InvertMatch {
|
||||||
|
// also apply -v
|
||||||
|
newdata.entries = append(newdata.entries, row)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &newdata, true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Transpose fields using search/replace regexp.
|
||||||
|
*/
|
||||||
|
func TransposeFields(conf cfg.Config, data *Tabdata) (*Tabdata, bool, error) {
|
||||||
|
if len(conf.UseTransposers) == 0 {
|
||||||
|
// nothing to be done
|
||||||
|
return nil, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
newdata := data.CloneEmpty()
|
||||||
|
transposed := false
|
||||||
|
|
||||||
|
for _, row := range data.entries {
|
||||||
|
transposedrow := false
|
||||||
|
|
||||||
|
for idx := range data.headers {
|
||||||
|
transposeidx, hasone := findindex(conf.UseTransposeColumns, idx+1)
|
||||||
|
if hasone {
|
||||||
|
row[idx] =
|
||||||
|
conf.UseTransposers[transposeidx].Search.ReplaceAllString(
|
||||||
|
row[idx],
|
||||||
|
conf.UseTransposers[transposeidx].Replace,
|
||||||
|
)
|
||||||
|
transposedrow = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if transposedrow {
|
||||||
|
// also apply -v
|
||||||
|
newdata.entries = append(newdata.entries, row)
|
||||||
|
transposed = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &newdata, transposed, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/* generic map.Exists(key) */
|
||||||
|
func Exists[K comparable, V any](m map[K]V, v K) bool {
|
||||||
|
if _, ok := m[v]; ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func FilterByPattern(conf cfg.Config, input io.Reader) (io.Reader, error) {
|
||||||
|
if conf.Pattern == "" {
|
||||||
|
return input, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
scanner := bufio.NewScanner(input)
|
||||||
|
lines := []string{}
|
||||||
|
hadFirst := false
|
||||||
|
|
||||||
|
for scanner.Scan() {
|
||||||
|
line := strings.TrimSpace(scanner.Text())
|
||||||
|
if hadFirst {
|
||||||
|
// don't match 1st line, it's the header
|
||||||
|
if conf.Pattern != "" && matchPattern(conf, line) == conf.InvertMatch {
|
||||||
|
// by default -v is false, so if a line does NOT
|
||||||
|
// match the pattern, we will ignore it. However,
|
||||||
|
// if the user specified -v, the matching is inverted,
|
||||||
|
// so we ignore all lines, which DO match.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lines = append(lines, line)
|
||||||
|
|
||||||
|
hadFirst = true
|
||||||
|
}
|
||||||
|
|
||||||
|
return strings.NewReader(strings.Join(lines, "\n")), nil
|
||||||
|
}
|
||||||
162
lib/filter_test.go
Normal file
162
lib/filter_test.go
Normal file
@@ -0,0 +1,162 @@
|
|||||||
|
/*
|
||||||
|
Copyright © 2024 Thomas von Dein
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lib
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMatchPattern(t *testing.T) {
|
||||||
|
var input = []struct {
|
||||||
|
name string
|
||||||
|
fuzzy bool
|
||||||
|
pattern string
|
||||||
|
line string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "normal",
|
||||||
|
pattern: "haus",
|
||||||
|
line: "hausparty",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "fuzzy",
|
||||||
|
pattern: "hpt",
|
||||||
|
line: "haus-party-termin",
|
||||||
|
fuzzy: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, inputdata := range input {
|
||||||
|
testname := fmt.Sprintf("match-pattern-%s", inputdata.name)
|
||||||
|
|
||||||
|
t.Run(testname, func(t *testing.T) {
|
||||||
|
conf := cfg.Config{}
|
||||||
|
|
||||||
|
if inputdata.fuzzy {
|
||||||
|
conf.UseFuzzySearch = true
|
||||||
|
}
|
||||||
|
|
||||||
|
err := conf.PreparePattern(inputdata.pattern)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("PreparePattern returned error: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !matchPattern(conf, inputdata.line) {
|
||||||
|
t.Errorf("matchPattern() did not match\nExp: true\nGot: false\n")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterByFields(t *testing.T) {
|
||||||
|
data := Tabdata{
|
||||||
|
headers: []string{
|
||||||
|
"ONE", "TWO", "THREE",
|
||||||
|
},
|
||||||
|
entries: [][]string{
|
||||||
|
{"asd", "igig", "cxxxncnc"},
|
||||||
|
{"19191", "EDD 1", "x"},
|
||||||
|
{"8d8", "AN 1", "y"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var input = []struct {
|
||||||
|
name string
|
||||||
|
filter []string
|
||||||
|
expect Tabdata
|
||||||
|
invert bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "one-field",
|
||||||
|
filter: []string{"one=19"},
|
||||||
|
expect: Tabdata{
|
||||||
|
headers: []string{
|
||||||
|
"ONE", "TWO", "THREE",
|
||||||
|
},
|
||||||
|
entries: [][]string{
|
||||||
|
{"19191", "EDD 1", "x"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: "one-field-inverted",
|
||||||
|
filter: []string{"one=19"},
|
||||||
|
invert: true,
|
||||||
|
expect: Tabdata{
|
||||||
|
headers: []string{
|
||||||
|
"ONE", "TWO", "THREE",
|
||||||
|
},
|
||||||
|
entries: [][]string{
|
||||||
|
{"asd", "igig", "cxxxncnc"},
|
||||||
|
{"8d8", "AN 1", "y"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: "many-fields",
|
||||||
|
filter: []string{"one=19", "two=DD"},
|
||||||
|
expect: Tabdata{
|
||||||
|
headers: []string{
|
||||||
|
"ONE", "TWO", "THREE",
|
||||||
|
},
|
||||||
|
entries: [][]string{
|
||||||
|
{"19191", "EDD 1", "x"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: "many-fields-inverted",
|
||||||
|
filter: []string{"one=19", "two=DD"},
|
||||||
|
invert: true,
|
||||||
|
expect: Tabdata{
|
||||||
|
headers: []string{
|
||||||
|
"ONE", "TWO", "THREE",
|
||||||
|
},
|
||||||
|
entries: [][]string{
|
||||||
|
{"asd", "igig", "cxxxncnc"},
|
||||||
|
{"8d8", "AN 1", "y"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, inputdata := range input {
|
||||||
|
testname := fmt.Sprintf("filter-by-fields-%s", inputdata.name)
|
||||||
|
|
||||||
|
t.Run(testname, func(t *testing.T) {
|
||||||
|
conf := cfg.Config{Rawfilters: inputdata.filter, InvertMatch: inputdata.invert}
|
||||||
|
|
||||||
|
err := conf.PrepareFilters()
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("PrepareFilters returned error: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, _, _ := FilterByFields(conf, &data)
|
||||||
|
if !reflect.DeepEqual(*data, inputdata.expect) {
|
||||||
|
t.Errorf("Filtered data does not match expected data:\ngot: %+v\nexp: %+v", data, inputdata.expect)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
263
lib/helpers.go
263
lib/helpers.go
@@ -20,13 +20,14 @@ package lib
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/gookit/color"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/gookit/color"
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
func contains(s []int, e int) bool {
|
func contains(s []int, e int) bool {
|
||||||
@@ -35,79 +36,162 @@ func contains(s []int, e int) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// parse columns list given with -c, modifies config.UseColumns based
|
func findindex(s []int, e int) (int, bool) {
|
||||||
// on eventually given regex
|
for i, a := range s {
|
||||||
func PrepareColumns(c *cfg.Config, data *Tabdata) error {
|
if a == e {
|
||||||
if len(c.Columns) > 0 {
|
return i, true
|
||||||
for _, use := range strings.Split(c.Columns, ",") {
|
|
||||||
if len(use) == 0 {
|
|
||||||
msg := fmt.Sprintf("Could not parse columns list %s: empty column", c.Columns)
|
|
||||||
return errors.New(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
usenum, err := strconv.Atoi(use)
|
|
||||||
if err != nil {
|
|
||||||
// might be a regexp
|
|
||||||
colPattern, err := regexp.Compile(use)
|
|
||||||
if err != nil {
|
|
||||||
msg := fmt.Sprintf("Could not parse columns list %s: %v", c.Columns, err)
|
|
||||||
return errors.New(msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// find matching header fields
|
|
||||||
for i, head := range data.headers {
|
|
||||||
if colPattern.MatchString(head) {
|
|
||||||
c.UseColumns = append(c.UseColumns, i+1)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// we digress from go best practises here, because if
|
|
||||||
// a colum spec is not a number, we process them above
|
|
||||||
// inside the err handler for atoi(). so only add the
|
|
||||||
// number, if it's really just a number.
|
|
||||||
c.UseColumns = append(c.UseColumns, usenum)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// deduplicate: put all values into a map (value gets map key)
|
|
||||||
// thereby removing duplicates, extract keys into new slice
|
|
||||||
// and sort it
|
|
||||||
imap := make(map[int]int, len(c.UseColumns))
|
|
||||||
for _, i := range c.UseColumns {
|
|
||||||
imap[i] = 0
|
|
||||||
}
|
|
||||||
c.UseColumns = nil
|
|
||||||
for k := range imap {
|
|
||||||
c.UseColumns = append(c.UseColumns, k)
|
|
||||||
}
|
|
||||||
sort.Ints(c.UseColumns)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// validate the consitency of parsed data
|
||||||
|
func ValidateConsistency(data *Tabdata) error {
|
||||||
|
expectedfields := len(data.headers)
|
||||||
|
|
||||||
|
for idx, row := range data.entries {
|
||||||
|
if len(row) != expectedfields {
|
||||||
|
return fmt.Errorf("row %d does not contain expected %d elements, but %d",
|
||||||
|
idx, expectedfields, len(row))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parse columns list given with -c, modifies config.UseColumns based
|
||||||
|
// on eventually given regex.
|
||||||
|
// This is an output filter, because -cN,N,... is being applied AFTER
|
||||||
|
// processing of the input data.
|
||||||
|
func PrepareColumns(conf *cfg.Config, data *Tabdata) error {
|
||||||
|
// -c columns
|
||||||
|
usecolumns, err := PrepareColumnVars(conf.Columns, data)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
conf.UseColumns = usecolumns
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Same thing as above but for -T option, which is an input option,
|
||||||
|
// because transposers are being applied before output.
|
||||||
|
func PrepareTransposerColumns(conf *cfg.Config, data *Tabdata) error {
|
||||||
|
// -T columns
|
||||||
|
usetransposecolumns, err := PrepareColumnVars(conf.TransposeColumns, data)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
conf.UseTransposeColumns = usetransposecolumns
|
||||||
|
|
||||||
|
// verify that columns and transposers match and prepare transposer structs
|
||||||
|
if err := conf.PrepareTransposers(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func PrepareColumnVars(columns string, data *Tabdata) ([]int, error) {
|
||||||
|
if columns == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
usecolumns := []int{}
|
||||||
|
|
||||||
|
isregex := regexp.MustCompile(`\W`)
|
||||||
|
|
||||||
|
for _, columnpattern := range strings.Split(columns, ",") {
|
||||||
|
if len(columnpattern) == 0 {
|
||||||
|
return nil, fmt.Errorf("could not parse columns list %s: empty column", columns)
|
||||||
|
}
|
||||||
|
|
||||||
|
usenum, err := strconv.Atoi(columnpattern)
|
||||||
|
if err != nil {
|
||||||
|
// not a number
|
||||||
|
|
||||||
|
if !isregex.MatchString(columnpattern) {
|
||||||
|
// is not a regexp (contains no non-word chars)
|
||||||
|
// lc() it so that word searches are case insensitive
|
||||||
|
columnpattern = strings.ToLower(columnpattern)
|
||||||
|
|
||||||
|
for i, head := range data.headers {
|
||||||
|
if columnpattern == strings.ToLower(head) {
|
||||||
|
usecolumns = append(usecolumns, i+1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
colPattern, err := regexp.Compile("(?i)" + columnpattern)
|
||||||
|
if err != nil {
|
||||||
|
msg := fmt.Sprintf("Could not parse columns list %s: %v", columns, err)
|
||||||
|
|
||||||
|
return nil, errors.New(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// find matching header fields, ignoring case
|
||||||
|
for i, head := range data.headers {
|
||||||
|
if colPattern.MatchString(strings.ToLower(head)) {
|
||||||
|
usecolumns = append(usecolumns, i+1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// we digress from go best practises here, because if
|
||||||
|
// a colum spec is not a number, we process them above
|
||||||
|
// inside the err handler for atoi(). so only add the
|
||||||
|
// number, if it's really just a number.
|
||||||
|
usecolumns = append(usecolumns, usenum)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// deduplicate: put all values into a map (value gets map key)
|
||||||
|
// thereby removing duplicates, extract keys into new slice
|
||||||
|
// and sort it
|
||||||
|
imap := make(map[int]int, len(usecolumns))
|
||||||
|
for _, i := range usecolumns {
|
||||||
|
imap[i] = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// fill with deduplicated columns
|
||||||
|
usecolumns = nil
|
||||||
|
|
||||||
|
for k := range imap {
|
||||||
|
usecolumns = append(usecolumns, k)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Ints(usecolumns)
|
||||||
|
|
||||||
|
return usecolumns, nil
|
||||||
|
}
|
||||||
|
|
||||||
// prepare headers: add numbers to headers
|
// prepare headers: add numbers to headers
|
||||||
func numberizeAndReduceHeaders(c cfg.Config, data *Tabdata) {
|
func numberizeAndReduceHeaders(conf cfg.Config, data *Tabdata) {
|
||||||
numberedHeaders := []string{}
|
numberedHeaders := []string{}
|
||||||
maxwidth := 0 // start from scratch, so we only look at displayed column widths
|
maxwidth := 0 // start from scratch, so we only look at displayed column widths
|
||||||
|
|
||||||
for i, head := range data.headers {
|
for idx, head := range data.headers {
|
||||||
headlen := 0
|
var headlen int
|
||||||
if len(c.Columns) > 0 {
|
|
||||||
|
if len(conf.Columns) > 0 {
|
||||||
// -c specified
|
// -c specified
|
||||||
if !contains(c.UseColumns, i+1) {
|
if !contains(conf.UseColumns, idx+1) {
|
||||||
// ignore this one
|
// ignore this one
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if c.NoNumbering {
|
|
||||||
|
if conf.NoNumbering {
|
||||||
numberedHeaders = append(numberedHeaders, head)
|
numberedHeaders = append(numberedHeaders, head)
|
||||||
headlen = len(head)
|
headlen = len(head)
|
||||||
} else {
|
} else {
|
||||||
numhead := fmt.Sprintf("%s(%d)", head, i+1)
|
numhead := fmt.Sprintf("%s(%d)", head, idx+1)
|
||||||
headlen = len(numhead)
|
headlen = len(numhead)
|
||||||
numberedHeaders = append(numberedHeaders, numhead)
|
numberedHeaders = append(numberedHeaders, numhead)
|
||||||
}
|
}
|
||||||
@@ -116,49 +200,94 @@ func numberizeAndReduceHeaders(c cfg.Config, data *Tabdata) {
|
|||||||
maxwidth = headlen
|
maxwidth = headlen
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data.headers = numberedHeaders
|
data.headers = numberedHeaders
|
||||||
|
|
||||||
if data.maxwidthHeader != maxwidth && maxwidth > 0 {
|
if data.maxwidthHeader != maxwidth && maxwidth > 0 {
|
||||||
data.maxwidthHeader = maxwidth
|
data.maxwidthHeader = maxwidth
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// exclude columns, if any
|
// exclude columns, if any
|
||||||
func reduceColumns(c cfg.Config, data *Tabdata) {
|
func reduceColumns(conf cfg.Config, data *Tabdata) {
|
||||||
if len(c.Columns) > 0 {
|
if len(conf.Columns) > 0 {
|
||||||
reducedEntries := [][]string{}
|
reducedEntries := [][]string{}
|
||||||
|
|
||||||
var reducedEntry []string
|
var reducedEntry []string
|
||||||
|
|
||||||
for _, entry := range data.entries {
|
for _, entry := range data.entries {
|
||||||
reducedEntry = nil
|
reducedEntry = nil
|
||||||
|
|
||||||
for i, value := range entry {
|
for i, value := range entry {
|
||||||
if !contains(c.UseColumns, i+1) {
|
if !contains(conf.UseColumns, i+1) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
reducedEntry = append(reducedEntry, value)
|
reducedEntry = append(reducedEntry, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
reducedEntries = append(reducedEntries, reducedEntry)
|
reducedEntries = append(reducedEntries, reducedEntry)
|
||||||
}
|
}
|
||||||
|
|
||||||
data.entries = reducedEntries
|
data.entries = reducedEntries
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME: remove this when we only use Tablewriter and strip in ParseFile()!
|
||||||
func trimRow(row []string) []string {
|
func trimRow(row []string) []string {
|
||||||
// FIXME: remove this when we only use Tablewriter and strip in ParseFile()!
|
var fixedrow = make([]string, len(row))
|
||||||
var fixedrow []string
|
|
||||||
for _, cell := range row {
|
for idx, cell := range row {
|
||||||
fixedrow = append(fixedrow, strings.TrimSpace(cell))
|
fixedrow[idx] = strings.TrimSpace(cell)
|
||||||
}
|
}
|
||||||
|
|
||||||
return fixedrow
|
return fixedrow
|
||||||
}
|
}
|
||||||
|
|
||||||
func colorizeData(c cfg.Config, output string) string {
|
// FIXME: refactor this beast!
|
||||||
if len(c.Pattern) > 0 && !c.NoColor && color.IsConsole(os.Stdout) {
|
func colorizeData(conf cfg.Config, output string) string {
|
||||||
r := regexp.MustCompile("(" + c.Pattern + ")")
|
switch {
|
||||||
|
case conf.UseHighlight && color.IsConsole(os.Stdout):
|
||||||
|
highlight := true
|
||||||
|
colorized := ""
|
||||||
|
first := true
|
||||||
|
|
||||||
|
for _, line := range strings.Split(output, "\n") {
|
||||||
|
if highlight {
|
||||||
|
if first {
|
||||||
|
// we need to add two spaces to the header line
|
||||||
|
// because tablewriter omits them for some reason
|
||||||
|
// in pprint mode. This doesn't matter as long as
|
||||||
|
// we don't use colorization. But with colors the
|
||||||
|
// missing spaces can be seen.
|
||||||
|
if conf.OutputMode == cfg.ASCII {
|
||||||
|
line += " "
|
||||||
|
}
|
||||||
|
|
||||||
|
line = conf.HighlightHdrStyle.Sprint(line)
|
||||||
|
first = false
|
||||||
|
} else {
|
||||||
|
line = conf.HighlightStyle.Sprint(line)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
line = conf.NoHighlightStyle.Sprint(line)
|
||||||
|
}
|
||||||
|
|
||||||
|
highlight = !highlight
|
||||||
|
|
||||||
|
colorized += line + "\n"
|
||||||
|
}
|
||||||
|
|
||||||
|
return colorized
|
||||||
|
|
||||||
|
case len(conf.Pattern) > 0 && !conf.NoColor && color.IsConsole(os.Stdout):
|
||||||
|
r := regexp.MustCompile("(" + conf.Pattern + ")")
|
||||||
|
|
||||||
return r.ReplaceAllStringFunc(output, func(in string) string {
|
return r.ReplaceAllStringFunc(output, func(in string) string {
|
||||||
return c.ColorStyle.Sprint(in)
|
return conf.ColorStyle.Sprint(in)
|
||||||
})
|
})
|
||||||
} else {
|
|
||||||
|
default:
|
||||||
return output
|
return output
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,9 +19,10 @@ package lib
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestContains(t *testing.T) {
|
func TestContains(t *testing.T) {
|
||||||
@@ -66,23 +67,103 @@ func TestPrepareColumns(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{"1,2,3", []int{1, 2, 3}, false},
|
{"1,2,3", []int{1, 2, 3}, false},
|
||||||
{"1,2,", []int{}, true},
|
{"1,2,", []int{}, true},
|
||||||
{"T", []int{2, 3}, false},
|
{"T.", []int{2, 3}, false},
|
||||||
{"T,2,3", []int{2, 3}, false},
|
{"T.,2,3", []int{2, 3}, false},
|
||||||
{"[a-z,4,5", []int{4, 5}, true}, // invalid regexp
|
{"[a-z,4,5", []int{4, 5}, true}, // invalid regexp
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("PrepareColumns-%s-%t", tt.input, tt.wanterror)
|
testname := fmt.Sprintf("PrepareColumns-%s-%t", testdata.input, testdata.wanterror)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := cfg.Config{Columns: tt.input}
|
conf := cfg.Config{Columns: testdata.input}
|
||||||
err := PrepareColumns(&c, &data)
|
err := PrepareColumns(&conf, &data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !tt.wanterror {
|
if !testdata.wanterror {
|
||||||
t.Errorf("got error: %v", err)
|
t.Errorf("got error: %v", err)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if !reflect.DeepEqual(c.UseColumns, tt.exp) {
|
if !reflect.DeepEqual(conf.UseColumns, testdata.exp) {
|
||||||
t.Errorf("got: %v, expected: %v", c.UseColumns, tt.exp)
|
t.Errorf("got: %v, expected: %v", conf.UseColumns, testdata.exp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPrepareTransposerColumns(t *testing.T) {
|
||||||
|
data := Tabdata{
|
||||||
|
maxwidthHeader: 5,
|
||||||
|
columns: 3,
|
||||||
|
headers: []string{
|
||||||
|
"ONE", "TWO", "THREE",
|
||||||
|
},
|
||||||
|
entries: [][]string{
|
||||||
|
{
|
||||||
|
"2", "3", "4",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var tests = []struct {
|
||||||
|
input string
|
||||||
|
transp []string
|
||||||
|
exp int
|
||||||
|
wanterror bool // expect error
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"1",
|
||||||
|
[]string{`/\d/x/`},
|
||||||
|
1,
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"T.", // will match [T]WO and [T]HREE
|
||||||
|
[]string{`/\d/x/`, `/.//`},
|
||||||
|
2,
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"TH.,2",
|
||||||
|
[]string{`/\d/x/`, `/.//`},
|
||||||
|
2,
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"1",
|
||||||
|
[]string{},
|
||||||
|
1,
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"",
|
||||||
|
[]string{`|.|N|`},
|
||||||
|
0,
|
||||||
|
true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"1",
|
||||||
|
[]string{`|.|N|`},
|
||||||
|
1,
|
||||||
|
false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, testdata := range tests {
|
||||||
|
testname := fmt.Sprintf("PrepareTransposerColumns-%s-%t", testdata.input, testdata.wanterror)
|
||||||
|
t.Run(testname, func(t *testing.T) {
|
||||||
|
conf := cfg.Config{TransposeColumns: testdata.input, Transposers: testdata.transp}
|
||||||
|
err := PrepareTransposerColumns(&conf, &data)
|
||||||
|
if err != nil {
|
||||||
|
if !testdata.wanterror {
|
||||||
|
t.Errorf("got error: %v", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if len(conf.UseTransposeColumns) != testdata.exp {
|
||||||
|
t.Errorf("got %d, want %d", conf.UseTransposeColumns, testdata.exp)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(conf.Transposers) != len(conf.UseTransposeColumns) {
|
||||||
|
t.Errorf("got %d, want %d", conf.UseTransposeColumns, testdata.exp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -114,14 +195,16 @@ func TestReduceColumns(t *testing.T) {
|
|||||||
|
|
||||||
input := [][]string{{"a", "b", "c"}}
|
input := [][]string{{"a", "b", "c"}}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("reduce-columns-by-%+v", tt.columns)
|
testname := fmt.Sprintf("reduce-columns-by-%+v", testdata.columns)
|
||||||
|
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := cfg.Config{Columns: "x", UseColumns: tt.columns}
|
c := cfg.Config{Columns: "x", UseColumns: testdata.columns}
|
||||||
data := Tabdata{entries: input}
|
data := Tabdata{entries: input}
|
||||||
reduceColumns(c, &data)
|
reduceColumns(c, &data)
|
||||||
if !reflect.DeepEqual(data.entries, tt.expect) {
|
if !reflect.DeepEqual(data.entries, testdata.expect) {
|
||||||
t.Errorf("reduceColumns returned invalid data:\ngot: %+v\nexp: %+v", data.entries, tt.expect)
|
t.Errorf("reduceColumns returned invalid data:\ngot: %+v\nexp: %+v",
|
||||||
|
data.entries, testdata.expect)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -142,15 +225,17 @@ func TestNumberizeHeaders(t *testing.T) {
|
|||||||
{[]string{"ONE", "TWO"}, []int{1, 2}, true},
|
{[]string{"ONE", "TWO"}, []int{1, 2}, true},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("numberize-headers-columns-%+v-nonum-%t", tt.columns, tt.nonum)
|
testname := fmt.Sprintf("numberize-headers-columns-%+v-nonum-%t",
|
||||||
|
testdata.columns, testdata.nonum)
|
||||||
|
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := cfg.Config{Columns: "x", UseColumns: tt.columns, NoNumbering: tt.nonum}
|
conf := cfg.Config{Columns: "x", UseColumns: testdata.columns, NoNumbering: testdata.nonum}
|
||||||
usedata := data
|
usedata := data
|
||||||
numberizeAndReduceHeaders(c, &usedata)
|
numberizeAndReduceHeaders(conf, &usedata)
|
||||||
if !reflect.DeepEqual(usedata.headers, tt.expect) {
|
if !reflect.DeepEqual(usedata.headers, testdata.expect) {
|
||||||
t.Errorf("numberizeAndReduceHeaders returned invalid data:\ngot: %+v\nexp: %+v",
|
t.Errorf("numberizeAndReduceHeaders returned invalid data:\ngot: %+v\nexp: %+v",
|
||||||
usedata.headers, tt.expect)
|
usedata.headers, testdata.expect)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
109
lib/io.go
109
lib/io.go
@@ -19,91 +19,82 @@ package lib
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/tlinden/tablizer/cfg"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ProcessFiles(c *cfg.Config, args []string) error {
|
const RWRR = 0755
|
||||||
fds, pattern, err := determineIO(c, args)
|
|
||||||
|
func ProcessFiles(conf *cfg.Config, args []string) error {
|
||||||
|
fd, pattern, err := determineIO(conf, args)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := c.PreparePattern(pattern); err != nil {
|
if err := conf.PreparePattern(pattern); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, fd := range fds {
|
data, err := Parse(*conf, fd)
|
||||||
data, err := Parse(*c, fd)
|
if err != nil {
|
||||||
if err != nil {
|
return err
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = PrepareColumns(c, &data)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
printData(os.Stdout, *c, &data)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err = ValidateConsistency(&data); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = PrepareColumns(conf, &data)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
printData(os.Stdout, *conf, &data)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func determineIO(c *cfg.Config, args []string) ([]io.Reader, string, error) {
|
func determineIO(conf *cfg.Config, args []string) (io.Reader, string, error) {
|
||||||
|
var filehandle io.Reader
|
||||||
var pattern string
|
var pattern string
|
||||||
var fds []io.Reader
|
|
||||||
var haveio bool
|
var haveio bool
|
||||||
|
|
||||||
stat, _ := os.Stdin.Stat()
|
switch {
|
||||||
if (stat.Mode() & os.ModeCharDevice) == 0 {
|
case conf.InputFile == "-":
|
||||||
// we're reading from STDIN, which takes precedence over file args
|
filehandle = os.Stdin
|
||||||
fds = append(fds, os.Stdin)
|
|
||||||
if len(args) > 0 {
|
|
||||||
// ignore any args > 1
|
|
||||||
pattern = args[0]
|
|
||||||
c.Pattern = args[0] // used for colorization by printData()
|
|
||||||
}
|
|
||||||
haveio = true
|
haveio = true
|
||||||
} else {
|
case conf.InputFile != "":
|
||||||
if len(args) > 0 {
|
fd, err := os.OpenFile(conf.InputFile, os.O_RDONLY, RWRR)
|
||||||
// threre were args left, take a look
|
|
||||||
if args[0] == "-" {
|
|
||||||
// in traditional unix programs a dash denotes STDIN (forced)
|
|
||||||
fds = append(fds, os.Stdin)
|
|
||||||
haveio = true
|
|
||||||
} else {
|
|
||||||
if _, err := os.Stat(args[0]); err != nil {
|
|
||||||
// first one is not a file, consider it as regexp and
|
|
||||||
// shift arg list
|
|
||||||
pattern = args[0]
|
|
||||||
c.Pattern = args[0] // used for colorization by printData()
|
|
||||||
args = args[1:]
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(args) > 0 {
|
if err != nil {
|
||||||
// consider any other args as files
|
return nil, "", fmt.Errorf("failed to read input file %s: %w", conf.InputFile, err)
|
||||||
for _, file := range args {
|
|
||||||
|
|
||||||
fd, err := os.OpenFile(file, os.O_RDONLY, 0755)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
fds = append(fds, fd)
|
|
||||||
haveio = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filehandle = fd
|
||||||
|
haveio = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !haveio {
|
if !haveio {
|
||||||
return nil, "", errors.New("No file specified and nothing to read on stdin!")
|
stat, _ := os.Stdin.Stat()
|
||||||
|
if (stat.Mode() & os.ModeCharDevice) == 0 {
|
||||||
|
// we're reading from STDIN, which takes precedence over file args
|
||||||
|
filehandle = os.Stdin
|
||||||
|
haveio = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return fds, pattern, nil
|
if len(args) > 0 {
|
||||||
|
pattern = args[0]
|
||||||
|
conf.Pattern = args[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
if !haveio {
|
||||||
|
return nil, "", errors.New("no file specified and nothing to read on stdin")
|
||||||
|
}
|
||||||
|
|
||||||
|
return filehandle, pattern, nil
|
||||||
}
|
}
|
||||||
|
|||||||
141
lib/parser.go
141
lib/parser.go
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022 Thomas von Dein
|
Copyright © 2022-2024 Thomas von Dein
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
@@ -20,61 +20,64 @@ package lib
|
|||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"encoding/csv"
|
"encoding/csv"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/alecthomas/repr"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"io"
|
"io"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alecthomas/repr"
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Parser switch
|
Parser switch
|
||||||
*/
|
*/
|
||||||
func Parse(c cfg.Config, input io.Reader) (Tabdata, error) {
|
func Parse(conf cfg.Config, input io.Reader) (Tabdata, error) {
|
||||||
if len(c.Separator) == 1 {
|
var data Tabdata
|
||||||
return parseCSV(c, input)
|
var err error
|
||||||
|
|
||||||
|
// first step, parse the data
|
||||||
|
if len(conf.Separator) == 1 {
|
||||||
|
data, err = parseCSV(conf, input)
|
||||||
|
} else {
|
||||||
|
data, err = parseTabular(conf, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
return parseTabular(c, input)
|
if err != nil {
|
||||||
|
return data, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2nd step, apply filters, code or transposers, if any
|
||||||
|
postdata, changed, err := PostProcess(conf, &data)
|
||||||
|
if err != nil {
|
||||||
|
return data, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if changed {
|
||||||
|
return *postdata, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return data, err
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Parse CSV input.
|
Parse CSV input.
|
||||||
*/
|
*/
|
||||||
func parseCSV(c cfg.Config, input io.Reader) (Tabdata, error) {
|
func parseCSV(conf cfg.Config, input io.Reader) (Tabdata, error) {
|
||||||
var content io.Reader = input
|
|
||||||
data := Tabdata{}
|
data := Tabdata{}
|
||||||
|
|
||||||
if len(c.Pattern) > 0 {
|
// apply pattern, if any
|
||||||
scanner := bufio.NewScanner(input)
|
content, err := FilterByPattern(conf, input)
|
||||||
lines := []string{}
|
if err != nil {
|
||||||
hadFirst := false
|
return data, err
|
||||||
for scanner.Scan() {
|
|
||||||
line := strings.TrimSpace(scanner.Text())
|
|
||||||
if hadFirst {
|
|
||||||
// don't match 1st line, it's the header
|
|
||||||
if c.PatternR.MatchString(line) == c.InvertMatch {
|
|
||||||
// by default -v is false, so if a line does NOT
|
|
||||||
// match the pattern, we will ignore it. However,
|
|
||||||
// if the user specified -v, the matching is inverted,
|
|
||||||
// so we ignore all lines, which DO match.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
lines = append(lines, line)
|
|
||||||
hadFirst = true
|
|
||||||
}
|
|
||||||
content = strings.NewReader(strings.Join(lines, "\n"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
csvreader := csv.NewReader(content)
|
csvreader := csv.NewReader(content)
|
||||||
csvreader.Comma = rune(c.Separator[0])
|
csvreader.Comma = rune(conf.Separator[0])
|
||||||
|
|
||||||
records, err := csvreader.ReadAll()
|
records, err := csvreader.ReadAll()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return data, errors.Unwrap(fmt.Errorf("Could not parse CSV input: %w", err))
|
return data, fmt.Errorf("could not parse CSV input: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(records) >= 1 {
|
if len(records) >= 1 {
|
||||||
@@ -98,15 +101,15 @@ func parseCSV(c cfg.Config, input io.Reader) (Tabdata, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Parse tabular input.
|
Parse tabular input.
|
||||||
*/
|
*/
|
||||||
func parseTabular(c cfg.Config, input io.Reader) (Tabdata, error) {
|
func parseTabular(conf cfg.Config, input io.Reader) (Tabdata, error) {
|
||||||
data := Tabdata{}
|
data := Tabdata{}
|
||||||
|
|
||||||
var scanner *bufio.Scanner
|
var scanner *bufio.Scanner
|
||||||
|
|
||||||
hadFirst := false
|
hadFirst := false
|
||||||
separate := regexp.MustCompile(c.Separator)
|
separate := regexp.MustCompile(conf.Separator)
|
||||||
|
|
||||||
scanner = bufio.NewScanner(input)
|
scanner = bufio.NewScanner(input)
|
||||||
|
|
||||||
@@ -117,16 +120,9 @@ func parseTabular(c cfg.Config, input io.Reader) (Tabdata, error) {
|
|||||||
if !hadFirst {
|
if !hadFirst {
|
||||||
// header processing
|
// header processing
|
||||||
data.columns = len(parts)
|
data.columns = len(parts)
|
||||||
// if Debug {
|
|
||||||
// fmt.Println(parts)
|
|
||||||
// }
|
|
||||||
|
|
||||||
// process all header fields
|
// process all header fields
|
||||||
for _, part := range parts {
|
for _, part := range parts {
|
||||||
// if Debug {
|
|
||||||
// fmt.Printf("Part: <%s>\n", string(line[beg:part[0]]))
|
|
||||||
//}
|
|
||||||
|
|
||||||
// register widest header field
|
// register widest header field
|
||||||
headerlen := len(part)
|
headerlen := len(part)
|
||||||
if headerlen > data.maxwidthHeader {
|
if headerlen > data.maxwidthHeader {
|
||||||
@@ -141,14 +137,12 @@ func parseTabular(c cfg.Config, input io.Reader) (Tabdata, error) {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// data processing
|
// data processing
|
||||||
if len(c.Pattern) > 0 {
|
if conf.Pattern != "" && matchPattern(conf, line) == conf.InvertMatch {
|
||||||
if c.PatternR.MatchString(line) == c.InvertMatch {
|
// by default -v is false, so if a line does NOT
|
||||||
// by default -v is false, so if a line does NOT
|
// match the pattern, we will ignore it. However,
|
||||||
// match the pattern, we will ignore it. However,
|
// if the user specified -v, the matching is inverted,
|
||||||
// if the user specified -v, the matching is inverted,
|
// so we ignore all lines, which DO match.
|
||||||
// so we ignore all lines, which DO match.
|
continue
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
idx := 0 // we cannot use the header index, because we could exclude columns
|
idx := 0 // we cannot use the header index, because we could exclude columns
|
||||||
@@ -172,12 +166,45 @@ func parseTabular(c cfg.Config, input io.Reader) (Tabdata, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if scanner.Err() != nil {
|
if scanner.Err() != nil {
|
||||||
return data, errors.Unwrap(fmt.Errorf("Failed to read from io.Reader: %w", scanner.Err()))
|
return data, fmt.Errorf("failed to read from io.Reader: %w", scanner.Err())
|
||||||
}
|
|
||||||
|
|
||||||
if c.Debug {
|
|
||||||
repr.Print(data)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return data, nil
|
return data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func PostProcess(conf cfg.Config, data *Tabdata) (*Tabdata, bool, error) {
|
||||||
|
var modified bool
|
||||||
|
|
||||||
|
// filter by field filters, if any
|
||||||
|
filtereddata, changed, err := FilterByFields(conf, data)
|
||||||
|
if err != nil {
|
||||||
|
return data, false, fmt.Errorf("failed to filter fields: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if changed {
|
||||||
|
data = filtereddata
|
||||||
|
modified = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if transposers are valid and turn into Transposer structs
|
||||||
|
if err := PrepareTransposerColumns(&conf, data); err != nil {
|
||||||
|
return data, false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// transpose if demanded
|
||||||
|
modifieddata, changed, err := TransposeFields(conf, data)
|
||||||
|
if err != nil {
|
||||||
|
return data, false, fmt.Errorf("failed to transpose fields: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if changed {
|
||||||
|
data = modifieddata
|
||||||
|
modified = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if conf.Debug {
|
||||||
|
repr.Print(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
return data, modified, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,10 +19,11 @@ package lib
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
var input = []struct {
|
var input = []struct {
|
||||||
@@ -61,12 +62,12 @@ func TestParser(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, in := range input {
|
for _, testdata := range input {
|
||||||
testname := fmt.Sprintf("parse-%s", in.name)
|
testname := fmt.Sprintf("parse-%s", testdata.name)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
readFd := strings.NewReader(strings.TrimSpace(in.text))
|
readFd := strings.NewReader(strings.TrimSpace(testdata.text))
|
||||||
c := cfg.Config{Separator: in.separator}
|
conf := cfg.Config{Separator: testdata.separator}
|
||||||
gotdata, err := Parse(c, readFd)
|
gotdata, err := Parse(conf, readFd)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Parser returned error: %s\nData processed so far: %+v", err, gotdata)
|
t.Errorf("Parser returned error: %s\nData processed so far: %+v", err, gotdata)
|
||||||
@@ -103,28 +104,28 @@ func TestParserPatternmatching(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, in := range input {
|
for _, inputdata := range input {
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("parse-%s-with-pattern-%s-inverted-%t",
|
testname := fmt.Sprintf("parse-%s-with-pattern-%s-inverted-%t",
|
||||||
in.name, tt.pattern, tt.invert)
|
inputdata.name, testdata.pattern, testdata.invert)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := cfg.Config{InvertMatch: tt.invert, Pattern: tt.pattern,
|
conf := cfg.Config{InvertMatch: testdata.invert, Pattern: testdata.pattern,
|
||||||
Separator: in.separator}
|
Separator: inputdata.separator}
|
||||||
|
|
||||||
_ = c.PreparePattern(tt.pattern)
|
_ = conf.PreparePattern(testdata.pattern)
|
||||||
|
|
||||||
readFd := strings.NewReader(strings.TrimSpace(in.text))
|
readFd := strings.NewReader(strings.TrimSpace(inputdata.text))
|
||||||
gotdata, err := Parse(c, readFd)
|
gotdata, err := Parse(conf, readFd)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !tt.want {
|
if !testdata.want {
|
||||||
t.Errorf("Parser returned error: %s\nData processed so far: %+v",
|
t.Errorf("Parser returned error: %s\nData processed so far: %+v",
|
||||||
err, gotdata)
|
err, gotdata)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if !reflect.DeepEqual(tt.entries, gotdata.entries) {
|
if !reflect.DeepEqual(testdata.entries, gotdata.entries) {
|
||||||
t.Errorf("Parser returned invalid data (pattern: %s, invert: %t)\nExp: %+v\nGot: %+v\n",
|
t.Errorf("Parser returned invalid data (pattern: %s, invert: %t)\nExp: %+v\nGot: %+v\n",
|
||||||
tt.pattern, tt.invert, tt.entries, gotdata.entries)
|
testdata.pattern, testdata.invert, testdata.entries, gotdata.entries)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -151,8 +152,8 @@ asd igig
|
|||||||
19191 EDD 1 X`
|
19191 EDD 1 X`
|
||||||
|
|
||||||
readFd := strings.NewReader(strings.TrimSpace(table))
|
readFd := strings.NewReader(strings.TrimSpace(table))
|
||||||
c := cfg.Config{Separator: cfg.DefaultSeparator}
|
conf := cfg.Config{Separator: cfg.DefaultSeparator}
|
||||||
gotdata, err := Parse(c, readFd)
|
gotdata, err := Parse(conf, readFd)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Parser returned error: %s\nData processed so far: %+v", err, gotdata)
|
t.Errorf("Parser returned error: %s\nData processed so far: %+v", err, gotdata)
|
||||||
@@ -160,6 +161,6 @@ asd igig
|
|||||||
|
|
||||||
if !reflect.DeepEqual(data, gotdata) {
|
if !reflect.DeepEqual(data, gotdata) {
|
||||||
t.Errorf("Parser returned invalid data, Regex: %s\nExp: %+v\nGot: %+v\n",
|
t.Errorf("Parser returned invalid data, Regex: %s\nExp: %+v\nGot: %+v\n",
|
||||||
c.Separator, data, gotdata)
|
conf.Separator, data, gotdata)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
134
lib/printer.go
134
lib/printer.go
@@ -20,62 +20,62 @@ package lib
|
|||||||
import (
|
import (
|
||||||
"encoding/csv"
|
"encoding/csv"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/gookit/color"
|
|
||||||
"github.com/olekukonko/tablewriter"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/gookit/color"
|
||||||
|
"github.com/olekukonko/tablewriter"
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
func printData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
||||||
// some output preparations:
|
|
||||||
|
|
||||||
// add numbers to headers and remove this we're not interested in
|
// add numbers to headers and remove this we're not interested in
|
||||||
numberizeAndReduceHeaders(c, data)
|
numberizeAndReduceHeaders(conf, data)
|
||||||
|
|
||||||
// remove unwanted columns, if any
|
// remove unwanted columns, if any
|
||||||
reduceColumns(c, data)
|
reduceColumns(conf, data)
|
||||||
|
|
||||||
// sort the data
|
// sort the data
|
||||||
sortTable(c, data)
|
sortTable(conf, data)
|
||||||
|
|
||||||
switch c.OutputMode {
|
switch conf.OutputMode {
|
||||||
case cfg.Extended:
|
case cfg.Extended:
|
||||||
printExtendedData(w, c, data)
|
printExtendedData(writer, conf, data)
|
||||||
case cfg.Ascii:
|
case cfg.ASCII:
|
||||||
printAsciiData(w, c, data)
|
printASCIIData(writer, conf, data)
|
||||||
case cfg.Orgtbl:
|
case cfg.Orgtbl:
|
||||||
printOrgmodeData(w, c, data)
|
printOrgmodeData(writer, conf, data)
|
||||||
case cfg.Markdown:
|
case cfg.Markdown:
|
||||||
printMarkdownData(w, c, data)
|
printMarkdownData(writer, conf, data)
|
||||||
case cfg.Shell:
|
case cfg.Shell:
|
||||||
printShellData(w, c, data)
|
printShellData(writer, data)
|
||||||
case cfg.Yaml:
|
case cfg.Yaml:
|
||||||
printYamlData(w, c, data)
|
printYamlData(writer, data)
|
||||||
case cfg.CSV:
|
case cfg.CSV:
|
||||||
printCSVData(w, c, data)
|
printCSVData(writer, data)
|
||||||
default:
|
default:
|
||||||
printAsciiData(w, c, data)
|
printASCIIData(writer, conf, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func output(w io.Writer, str string) {
|
func output(writer io.Writer, str string) {
|
||||||
fmt.Fprint(w, str)
|
fmt.Fprint(writer, str)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Emacs org-mode compatible table (also orgtbl-mode)
|
Emacs org-mode compatible table (also orgtbl-mode)
|
||||||
*/
|
*/
|
||||||
func printOrgmodeData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printOrgmodeData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
||||||
tableString := &strings.Builder{}
|
tableString := &strings.Builder{}
|
||||||
table := tablewriter.NewWriter(tableString)
|
table := tablewriter.NewWriter(tableString)
|
||||||
|
|
||||||
table.SetHeader(data.headers)
|
if !conf.NoHeaders {
|
||||||
|
table.SetHeader(data.headers)
|
||||||
|
}
|
||||||
|
|
||||||
for _, row := range data.entries {
|
for _, row := range data.entries {
|
||||||
table.Append(trimRow(row))
|
table.Append(trimRow(row))
|
||||||
@@ -97,20 +97,22 @@ func printOrgmodeData(w io.Writer, c cfg.Config, data *Tabdata) {
|
|||||||
leftR := regexp.MustCompile(`(?m)^\\+`)
|
leftR := regexp.MustCompile(`(?m)^\\+`)
|
||||||
rightR := regexp.MustCompile(`\\+(?m)$`)
|
rightR := regexp.MustCompile(`\\+(?m)$`)
|
||||||
|
|
||||||
output(w, color.Sprint(
|
output(writer, color.Sprint(
|
||||||
colorizeData(c,
|
colorizeData(conf,
|
||||||
rightR.ReplaceAllString(
|
rightR.ReplaceAllString(
|
||||||
leftR.ReplaceAllString(tableString.String(), "|"), "|"))))
|
leftR.ReplaceAllString(tableString.String(), "|"), "|"))))
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Markdown table
|
Markdown table
|
||||||
*/
|
*/
|
||||||
func printMarkdownData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printMarkdownData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
||||||
tableString := &strings.Builder{}
|
tableString := &strings.Builder{}
|
||||||
table := tablewriter.NewWriter(tableString)
|
table := tablewriter.NewWriter(tableString)
|
||||||
|
|
||||||
table.SetHeader(data.headers)
|
if !conf.NoHeaders {
|
||||||
|
table.SetHeader(data.headers)
|
||||||
|
}
|
||||||
|
|
||||||
for _, row := range data.entries {
|
for _, row := range data.entries {
|
||||||
table.Append(trimRow(row))
|
table.Append(trimRow(row))
|
||||||
@@ -120,22 +122,21 @@ func printMarkdownData(w io.Writer, c cfg.Config, data *Tabdata) {
|
|||||||
table.SetCenterSeparator("|")
|
table.SetCenterSeparator("|")
|
||||||
|
|
||||||
table.Render()
|
table.Render()
|
||||||
output(w, color.Sprint(colorizeData(c, tableString.String())))
|
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Simple ASCII table without any borders etc, just like the input we expect
|
Simple ASCII table without any borders etc, just like the input we expect
|
||||||
*/
|
*/
|
||||||
func printAsciiData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
||||||
tableString := &strings.Builder{}
|
tableString := &strings.Builder{}
|
||||||
table := tablewriter.NewWriter(tableString)
|
table := tablewriter.NewWriter(tableString)
|
||||||
|
|
||||||
table.SetHeader(data.headers)
|
if !conf.NoHeaders {
|
||||||
table.AppendBulk(data.entries)
|
table.SetHeader(data.headers)
|
||||||
|
}
|
||||||
|
|
||||||
// for _, row := range data.entries {
|
table.AppendBulk(data.entries)
|
||||||
// table.Append(trimRow(row))
|
|
||||||
// }
|
|
||||||
|
|
||||||
table.SetAutoWrapText(false)
|
table.SetAutoWrapText(false)
|
||||||
table.SetAutoFormatHeaders(true)
|
table.SetAutoFormatHeaders(true)
|
||||||
@@ -146,20 +147,27 @@ func printAsciiData(w io.Writer, c cfg.Config, data *Tabdata) {
|
|||||||
table.SetRowSeparator("")
|
table.SetRowSeparator("")
|
||||||
table.SetHeaderLine(false)
|
table.SetHeaderLine(false)
|
||||||
table.SetBorder(false)
|
table.SetBorder(false)
|
||||||
table.SetTablePadding("\t") // pad with tabs
|
|
||||||
table.SetNoWhiteSpace(true)
|
table.SetNoWhiteSpace(true)
|
||||||
|
|
||||||
|
if !conf.UseHighlight {
|
||||||
|
// the tabs destroy the highlighting
|
||||||
|
table.SetTablePadding("\t") // pad with tabs
|
||||||
|
} else {
|
||||||
|
table.SetTablePadding(" ")
|
||||||
|
}
|
||||||
|
|
||||||
table.Render()
|
table.Render()
|
||||||
output(w, color.Sprint(colorizeData(c, tableString.String())))
|
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
We simulate the \x command of psql (the PostgreSQL client)
|
We simulate the \x command of psql (the PostgreSQL client)
|
||||||
*/
|
*/
|
||||||
func printExtendedData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printExtendedData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
||||||
// needed for data output
|
// needed for data output
|
||||||
format := fmt.Sprintf("%%%ds: %%s\n", data.maxwidthHeader)
|
format := fmt.Sprintf("%%%ds: %%s\n", data.maxwidthHeader)
|
||||||
out := ""
|
out := ""
|
||||||
|
|
||||||
if len(data.entries) > 0 {
|
if len(data.entries) > 0 {
|
||||||
for _, entry := range data.entries {
|
for _, entry := range data.entries {
|
||||||
for i, value := range entry {
|
for i, value := range entry {
|
||||||
@@ -170,67 +178,71 @@ func printExtendedData(w io.Writer, c cfg.Config, data *Tabdata) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
output(w, colorizeData(c, out))
|
output(writer, colorizeData(conf, out))
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Shell output, ready to be eval'd. Just like FreeBSD stat(1)
|
Shell output, ready to be eval'd. Just like FreeBSD stat(1)
|
||||||
*/
|
*/
|
||||||
func printShellData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printShellData(writer io.Writer, data *Tabdata) {
|
||||||
out := ""
|
out := ""
|
||||||
|
|
||||||
if len(data.entries) > 0 {
|
if len(data.entries) > 0 {
|
||||||
for _, entry := range data.entries {
|
for _, entry := range data.entries {
|
||||||
shentries := []string{}
|
shentries := []string{}
|
||||||
for i, value := range entry {
|
|
||||||
|
for idx, value := range entry {
|
||||||
shentries = append(shentries, fmt.Sprintf("%s=\"%s\"",
|
shentries = append(shentries, fmt.Sprintf("%s=\"%s\"",
|
||||||
data.headers[i], value))
|
data.headers[idx], value))
|
||||||
}
|
}
|
||||||
out += fmt.Sprint(strings.Join(shentries, " ")) + "\n"
|
|
||||||
|
out += strings.Join(shentries, " ") + "\n"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// no colorization here
|
// no colorization here
|
||||||
output(w, out)
|
output(writer, out)
|
||||||
}
|
}
|
||||||
|
|
||||||
func printYamlData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printYamlData(writer io.Writer, data *Tabdata) {
|
||||||
type D struct {
|
type Data struct {
|
||||||
Entries []map[string]interface{} `yaml:"entries"`
|
Entries []map[string]interface{} `yaml:"entries"`
|
||||||
}
|
}
|
||||||
|
|
||||||
d := D{}
|
yamlout := Data{}
|
||||||
|
|
||||||
for _, entry := range data.entries {
|
for _, entry := range data.entries {
|
||||||
ml := map[string]interface{}{}
|
yamldata := map[string]interface{}{}
|
||||||
|
|
||||||
for i, entry := range entry {
|
for idx, entry := range entry {
|
||||||
style := yaml.TaggedStyle
|
style := yaml.TaggedStyle
|
||||||
|
|
||||||
_, err := strconv.Atoi(entry)
|
_, err := strconv.Atoi(entry)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
style = yaml.DoubleQuotedStyle
|
style = yaml.DoubleQuotedStyle
|
||||||
}
|
}
|
||||||
|
|
||||||
ml[strings.ToLower(data.headers[i])] =
|
yamldata[strings.ToLower(data.headers[idx])] =
|
||||||
&yaml.Node{
|
&yaml.Node{
|
||||||
Kind: yaml.ScalarNode,
|
Kind: yaml.ScalarNode,
|
||||||
Style: style,
|
Style: style,
|
||||||
Value: entry}
|
Value: entry}
|
||||||
}
|
}
|
||||||
|
|
||||||
d.Entries = append(d.Entries, ml)
|
yamlout.Entries = append(yamlout.Entries, yamldata)
|
||||||
}
|
}
|
||||||
|
|
||||||
yamlstr, err := yaml.Marshal(&d)
|
yamlstr, err := yaml.Marshal(&yamlout)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
output(w, string(yamlstr))
|
output(writer, string(yamlstr))
|
||||||
}
|
}
|
||||||
|
|
||||||
func printCSVData(w io.Writer, c cfg.Config, data *Tabdata) {
|
func printCSVData(writer io.Writer, data *Tabdata) {
|
||||||
csvout := csv.NewWriter(w)
|
csvout := csv.NewWriter(writer)
|
||||||
|
|
||||||
if err := csvout.Write(data.headers); err != nil {
|
if err := csvout.Write(data.headers); err != nil {
|
||||||
log.Fatalln("error writing record to csv:", err)
|
log.Fatalln("error writing record to csv:", err)
|
||||||
|
|||||||
@@ -20,10 +20,10 @@ package lib
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
//"github.com/alecthomas/repr"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newData() Tabdata {
|
func newData() Tabdata {
|
||||||
@@ -73,7 +73,7 @@ var tests = []struct {
|
|||||||
}{
|
}{
|
||||||
// --------------------- Default settings mode tests ``
|
// --------------------- Default settings mode tests ``
|
||||||
{
|
{
|
||||||
mode: cfg.Ascii,
|
mode: cfg.ASCII,
|
||||||
name: "default",
|
name: "default",
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
||||||
@@ -250,39 +250,39 @@ DURATION(2) WHEN(4)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPrinter(t *testing.T) {
|
func TestPrinter(t *testing.T) {
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("print-sortcol-%d-desc-%t-sortby-%s-mode-%d-usecolumns-%s",
|
testname := fmt.Sprintf("print-sortcol-%d-desc-%t-sortby-%s-mode-%d-usecolumns-%s",
|
||||||
tt.column, tt.desc, tt.sortby, tt.mode, tt.usecolstr)
|
testdata.column, testdata.desc, testdata.sortby, testdata.mode, testdata.usecolstr)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
// replaces os.Stdout, but we ignore it
|
// replaces os.Stdout, but we ignore it
|
||||||
var w bytes.Buffer
|
var writer bytes.Buffer
|
||||||
|
|
||||||
// cmd flags
|
// cmd flags
|
||||||
c := cfg.Config{
|
conf := cfg.Config{
|
||||||
SortByColumn: tt.column,
|
SortByColumn: testdata.column,
|
||||||
SortDescending: tt.desc,
|
SortDescending: testdata.desc,
|
||||||
SortMode: tt.sortby,
|
SortMode: testdata.sortby,
|
||||||
OutputMode: tt.mode,
|
OutputMode: testdata.mode,
|
||||||
NoNumbering: tt.nonum,
|
NoNumbering: testdata.nonum,
|
||||||
UseColumns: tt.usecol,
|
UseColumns: testdata.usecol,
|
||||||
NoColor: true,
|
NoColor: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
c.ApplyDefaults()
|
conf.ApplyDefaults()
|
||||||
|
|
||||||
// the test checks the len!
|
// the test checks the len!
|
||||||
if len(tt.usecol) > 0 {
|
if len(testdata.usecol) > 0 {
|
||||||
c.Columns = "yes"
|
conf.Columns = "yes"
|
||||||
} else {
|
} else {
|
||||||
c.Columns = ""
|
conf.Columns = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
testdata := newData()
|
data := newData()
|
||||||
exp := strings.TrimSpace(tt.expect)
|
exp := strings.TrimSpace(testdata.expect)
|
||||||
|
|
||||||
printData(&w, c, &testdata)
|
printData(&writer, conf, &data)
|
||||||
|
|
||||||
got := strings.TrimSpace(w.String())
|
got := strings.TrimSpace(writer.String())
|
||||||
|
|
||||||
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",
|
||||||
|
|||||||
62
lib/sort.go
62
lib/sort.go
@@ -18,21 +18,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
package lib
|
package lib
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/araddon/dateparse"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/araddon/dateparse"
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
func sortTable(c cfg.Config, data *Tabdata) {
|
func sortTable(conf cfg.Config, data *Tabdata) {
|
||||||
if c.SortByColumn <= 0 {
|
if conf.SortByColumn <= 0 {
|
||||||
// no sorting wanted
|
// no sorting wanted
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// slightly modified here to match internal array indicies
|
// slightly modified here to match internal array indicies
|
||||||
col := c.SortByColumn
|
col := conf.SortByColumn
|
||||||
|
|
||||||
col-- // ui starts counting by 1, but use 0 internally
|
col-- // ui starts counting by 1, but use 0 internally
|
||||||
|
|
||||||
@@ -48,38 +49,42 @@ func sortTable(c cfg.Config, data *Tabdata) {
|
|||||||
|
|
||||||
// actual sorting
|
// actual sorting
|
||||||
sort.SliceStable(data.entries, func(i, j int) bool {
|
sort.SliceStable(data.entries, func(i, j int) bool {
|
||||||
return compare(&c, data.entries[i][col], data.entries[j][col])
|
return compare(&conf, data.entries[i][col], data.entries[j][col])
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// config is not modified here, but it would be inefficient to copy it every loop
|
// config is not modified here, but it would be inefficient to copy it every loop
|
||||||
func compare(c *cfg.Config, a string, b string) bool {
|
func compare(conf *cfg.Config, left string, right string) bool {
|
||||||
var comp bool
|
var comp bool
|
||||||
|
|
||||||
switch c.SortMode {
|
switch conf.SortMode {
|
||||||
case "numeric":
|
case "numeric":
|
||||||
left, err := strconv.Atoi(a)
|
left, err := strconv.Atoi(left)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
left = 0
|
left = 0
|
||||||
}
|
}
|
||||||
right, err := strconv.Atoi(b)
|
|
||||||
|
right, err := strconv.Atoi(right)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
right = 0
|
right = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
comp = left < right
|
comp = left < right
|
||||||
case "duration":
|
case "duration":
|
||||||
left := duration2int(a)
|
left := duration2int(left)
|
||||||
right := duration2int(b)
|
right := duration2int(right)
|
||||||
|
|
||||||
comp = left < right
|
comp = left < right
|
||||||
case "time":
|
case "time":
|
||||||
left, _ := dateparse.ParseAny(a)
|
left, _ := dateparse.ParseAny(left)
|
||||||
right, _ := dateparse.ParseAny(b)
|
right, _ := dateparse.ParseAny(right)
|
||||||
|
|
||||||
comp = left.Unix() < right.Unix()
|
comp = left.Unix() < right.Unix()
|
||||||
default:
|
default:
|
||||||
comp = a < b
|
comp = left < right
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.SortDescending {
|
if conf.SortDescending {
|
||||||
comp = !comp
|
comp = !comp
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,15 +92,15 @@ func compare(c *cfg.Config, a string, b string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
We could use time.ParseDuration(), but this doesn't support days.
|
We could use time.ParseDuration(), but this doesn't support days.
|
||||||
|
|
||||||
We could also use github.com/xhit/go-str2duration/v2, which does
|
We could also use github.com/xhit/go-str2duration/v2, which does
|
||||||
the job, but it's just another dependency, just for this little
|
the job, but it's just another dependency, just for this little
|
||||||
gem. And we don't need a time.Time value. And int is good enough
|
gem. And we don't need a time.Time value. And int is good enough
|
||||||
for duration comparision.
|
for duration comparison.
|
||||||
|
|
||||||
Convert a durartion into an integer. Valid time units are "s",
|
Convert a duration into an integer. Valid time units are "s",
|
||||||
"m", "h" and "d".
|
"m", "h" and "d".
|
||||||
*/
|
*/
|
||||||
func duration2int(duration string) int {
|
func duration2int(duration string) int {
|
||||||
re := regexp.MustCompile(`(\d+)([dhms])`)
|
re := regexp.MustCompile(`(\d+)([dhms])`)
|
||||||
@@ -103,16 +108,17 @@ func duration2int(duration string) int {
|
|||||||
|
|
||||||
for _, match := range re.FindAllStringSubmatch(duration, -1) {
|
for _, match := range re.FindAllStringSubmatch(duration, -1) {
|
||||||
if len(match) == 3 {
|
if len(match) == 3 {
|
||||||
v, _ := strconv.Atoi(match[1])
|
durationvalue, _ := strconv.Atoi(match[1])
|
||||||
|
|
||||||
switch match[2][0] {
|
switch match[2][0] {
|
||||||
case 'd':
|
case 'd':
|
||||||
seconds += v * 86400
|
seconds += durationvalue * 86400
|
||||||
case 'h':
|
case 'h':
|
||||||
seconds += v * 3600
|
seconds += durationvalue * 3600
|
||||||
case 'm':
|
case 'm':
|
||||||
seconds += v * 60
|
seconds += durationvalue * 60
|
||||||
case 's':
|
case 's':
|
||||||
seconds += v
|
seconds += durationvalue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,8 +19,9 @@ package lib
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/tlinden/tablizer/cfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDuration2Seconds(t *testing.T) {
|
func TestDuration2Seconds(t *testing.T) {
|
||||||
@@ -36,12 +37,12 @@ func TestDuration2Seconds(t *testing.T) {
|
|||||||
{"19t77X what?4s", 4},
|
{"19t77X what?4s", 4},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("duration-%s", tt.dur)
|
testname := fmt.Sprintf("duration-%s", testdata.dur)
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
seconds := duration2int(tt.dur)
|
seconds := duration2int(testdata.dur)
|
||||||
if seconds != tt.expect {
|
if seconds != testdata.expect {
|
||||||
t.Errorf("got %d, want %d", seconds, tt.expect)
|
t.Errorf("got %d, want %d", seconds, testdata.expect)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -66,13 +67,15 @@ func TestCompare(t *testing.T) {
|
|||||||
{"time", "12/24/2022", "1/1/1970", true, true},
|
{"time", "12/24/2022", "1/1/1970", true, true},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("compare-mode-%s-a-%s-b-%s-desc-%t", tt.mode, tt.a, tt.b, tt.desc)
|
testname := fmt.Sprintf("compare-mode-%s-a-%s-b-%s-desc-%t",
|
||||||
|
testdata.mode, testdata.a, testdata.b, testdata.desc)
|
||||||
|
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
c := cfg.Config{SortMode: tt.mode, SortDescending: tt.desc}
|
c := cfg.Config{SortMode: testdata.mode, SortDescending: testdata.desc}
|
||||||
got := compare(&c, tt.a, tt.b)
|
got := compare(&c, testdata.a, testdata.b)
|
||||||
if got != tt.want {
|
if got != testdata.want {
|
||||||
t.Errorf("got %t, want %t", got, tt.want)
|
t.Errorf("got %t, want %t", got, testdata.want)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
10
main.go
10
main.go
@@ -18,9 +18,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
"github.com/tlinden/tablizer/cmd"
|
"github.com/tlinden/tablizer/cmd"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
cmd.Execute()
|
os.Exit(Main())
|
||||||
|
}
|
||||||
|
|
||||||
|
func Main() int {
|
||||||
|
cmd.Execute()
|
||||||
|
|
||||||
|
return 0 // cmd takes care of exit 1 itself
|
||||||
}
|
}
|
||||||
|
|||||||
20
main_test.go
Normal file
20
main_test.go
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/rogpeppe/go-internal/testscript"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMain(m *testing.M) {
|
||||||
|
os.Exit(testscript.RunMain(m, map[string]func() int{
|
||||||
|
"tablizer": Main,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTablizer(t *testing.T) {
|
||||||
|
testscript.Run(t, testscript.Params{
|
||||||
|
Dir: "t",
|
||||||
|
})
|
||||||
|
}
|
||||||
2
mkrel.sh
2
mkrel.sh
@@ -43,7 +43,7 @@ for D in $DIST; do
|
|||||||
tardir="${tool}-${os}-${arch}-${version}"
|
tardir="${tool}-${os}-${arch}-${version}"
|
||||||
tarfile="releases/${tool}-${os}-${arch}-${version}.tar.gz"
|
tarfile="releases/${tool}-${os}-${arch}-${version}.tar.gz"
|
||||||
set -x
|
set -x
|
||||||
GOOS=${os} GOARCH=${arch} go build -o ${binfile} -ldflags "-X 'github.com/tlinden/tablizer/lib.VERSION=${version}'"
|
GOOS=${os} GOARCH=${arch} go build -o ${binfile} -ldflags "-X 'github.com/tlinden/tablizer/cfg.VERSION=${version}'"
|
||||||
mkdir -p ${tardir}
|
mkdir -p ${tardir}
|
||||||
cp ${binfile} README.md LICENSE ${tardir}/
|
cp ${binfile} README.md LICENSE ${tardir}/
|
||||||
echo 'tool = tablizer
|
echo 'tool = tablizer
|
||||||
|
|||||||
10
t/plugintest.zy
Normal file
10
t/plugintest.zy
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
Simple filter hook function. Splits the argument by whitespace,
|
||||||
|
fetches the 2nd element, converts it to an int and returns true
|
||||||
|
if it s larger than 5, false otherwise.
|
||||||
|
*/
|
||||||
|
(defn uselarge [line]
|
||||||
|
(cond (> (atoi (second (resplit line `\s+`))) 5) true false))
|
||||||
|
|
||||||
|
/* Register the filter hook */
|
||||||
|
(addhook %filter %uselarge)
|
||||||
43
t/test-basics.txtar
Normal file
43
t/test-basics.txtar
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
# usage
|
||||||
|
exec tablizer -h
|
||||||
|
stdout Usage
|
||||||
|
|
||||||
|
# version
|
||||||
|
exec tablizer -V
|
||||||
|
stdout version
|
||||||
|
|
||||||
|
# manpage
|
||||||
|
exec tablizer -m
|
||||||
|
stdout SYNOPSIS
|
||||||
|
|
||||||
|
# completion
|
||||||
|
exec tablizer --completion bash
|
||||||
|
stdout __tablizer_init_completion
|
||||||
|
|
||||||
|
# use config (configures colors, but these are not being used, since
|
||||||
|
# this env doesn't support it, but at least it should succeed.
|
||||||
|
exec tablizer -f config.hcl -r testtable.txt Runn
|
||||||
|
stdout Runn
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.txt --
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0 2/2 Running 35 (45m ago) 11d
|
||||||
|
grafana-fcc54cbc9-bk7s8 1/1 Running 17 (45m ago) 1d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7 1/1 Running 17 (45m ago) 1h44m
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f 1/1 Running 20 (45m ago) 45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl 1/1 Running 17 (45m ago) 54s
|
||||||
|
|
||||||
|
|
||||||
|
-- config.hcl --
|
||||||
|
BG = "lightGreen"
|
||||||
|
FG = "white"
|
||||||
|
HighlightBG = "lightGreen"
|
||||||
|
HighlightFG = "white"
|
||||||
|
NoHighlightBG = "white"
|
||||||
|
NoHighlightFG = "lightGreen"
|
||||||
|
HighlightHdrBG = "red"
|
||||||
|
HighlightHdrFG = "white"
|
||||||
|
|
||||||
26
t/test-csv.txtar
Normal file
26
t/test-csv.txtar
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
# reading from file and matching with lowercase words
|
||||||
|
exec tablizer -c name,status -r testtable.csv -s,
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# matching mixed case
|
||||||
|
exec tablizer -c NAME,staTUS -r testtable.csv -s,
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# matching using numbers
|
||||||
|
exec tablizer -c 1,3 -r testtable.csv -s,
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# matching using regex
|
||||||
|
exec tablizer -c 'na.*,stat.' -r testtable.csv -s,
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.csv --
|
||||||
|
NAME,READY,STATUS,RESTARTS,AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0,2/2,Running,35 (45m ago),11d
|
||||||
|
grafana-fcc54cbc9-bk7s8,1/1,Running,17 (45m ago),1d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7,1/1,Running,17 (45m ago),1h44m
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f,1/1,Running,20 (45m ago),45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl,1/1,Running,17 (45m ago),54s
|
||||||
|
|
||||||
21
t/test-filtering.txtar
Normal file
21
t/test-filtering.txtar
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# filtering
|
||||||
|
exec tablizer -r testtable.txt -F name=grafana
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# filtering two columns
|
||||||
|
exec tablizer -r testtable.txt -F name=prometh -F age=1h
|
||||||
|
stdout blackbox.*Runn
|
||||||
|
|
||||||
|
# filtering two same columns
|
||||||
|
exec tablizer -r testtable.txt -F name=prometh -F name=alert
|
||||||
|
stdout prometheus-alertmanager.*Runn
|
||||||
|
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.txt --
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0 2/2 Running 35 (45m ago) 11d
|
||||||
|
grafana-fcc54cbc9-bk7s8 1/1 Running 17 (45m ago) 1d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7 1/1 Running 17 (45m ago) 1h44m
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f 1/1 Running 20 (45m ago) 45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl 1/1 Running 17 (45m ago) 54s
|
||||||
25
t/test-headermatching.txtar
Normal file
25
t/test-headermatching.txtar
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
# reading from file and matching with lowercase words
|
||||||
|
exec tablizer -c name,status -r testtable.txt
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# matching mixed case
|
||||||
|
exec tablizer -c NAME,staTUS -r testtable.txt
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# matching using numbers
|
||||||
|
exec tablizer -c 1,3 -r testtable.txt
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# matching using regex
|
||||||
|
exec tablizer -c 'na.*,stat.' -r testtable.txt
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.txt --
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0 2/2 Running 35 (45m ago) 11d
|
||||||
|
grafana-fcc54cbc9-bk7s8 1/1 Running 17 (45m ago) 1d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7 1/1 Running 17 (45m ago) 1h44m
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f 1/1 Running 20 (45m ago) 45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl 1/1 Running 17 (45m ago) 54s
|
||||||
49
t/test-sort.txtar
Normal file
49
t/test-sort.txtar
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
# sort by name
|
||||||
|
exec tablizer -r testtable.txt -k 1
|
||||||
|
stdout '^alert.*\n^grafana.*\n^kube'
|
||||||
|
|
||||||
|
# sort by name reversed
|
||||||
|
exec tablizer -r testtable.txt -k 1 -D
|
||||||
|
stdout 'kube.*\n^grafana.*\n^alert'
|
||||||
|
|
||||||
|
# sort by starts numerically
|
||||||
|
exec tablizer -r testtable.txt -k 4 -i -c4
|
||||||
|
stdout '17\s*\n^20\s*\n^35'
|
||||||
|
|
||||||
|
# sort by starts numerically reversed
|
||||||
|
exec tablizer -r testtable.txt -k 4 -i -c4 -D
|
||||||
|
stdout '35\s*\n^20\s*\n^17'
|
||||||
|
|
||||||
|
# sort by age
|
||||||
|
exec tablizer -r testtable.txt -k 5 -a
|
||||||
|
stdout '45m\s*\n.*1h44m'
|
||||||
|
|
||||||
|
# sort by age reverse
|
||||||
|
exec tablizer -r testtable.txt -k 5 -a -D
|
||||||
|
stdout '1h44m\s*\n.*45m'
|
||||||
|
|
||||||
|
# sort by time
|
||||||
|
exec tablizer -r timetable.txt -k 2 -t
|
||||||
|
stdout '^sel.*\n^foo.*\nbar'
|
||||||
|
|
||||||
|
# sort by time reverse
|
||||||
|
exec tablizer -r timetable.txt -k 2 -t -D
|
||||||
|
stdout '^bar.*\n^foo.*\nsel'
|
||||||
|
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.txt --
|
||||||
|
NAME READY STATUS STARTS AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0 2/2 Running 35 11d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7 1/1 Running 17 1h44m
|
||||||
|
grafana-fcc54cbc9-bk7s8 1/1 Running 17 1d
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f 1/1 Running 20 45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl 1/1 Running 17 54s
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- timetable.txt --
|
||||||
|
NAME TIME
|
||||||
|
foo 2024-11-18T12:00:00+01:00
|
||||||
|
bar 2024-11-18T12:45:00+01:00
|
||||||
|
sel 2024-07-18T12:00:00+01:00
|
||||||
18
t/test-stdin.txtar
Normal file
18
t/test-stdin.txtar
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# reading from stdin and matching with lowercase words
|
||||||
|
stdin testtable.txt
|
||||||
|
exec tablizer -c name,status
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# reading from -r stdin and matching with lowercase words
|
||||||
|
stdin testtable.txt
|
||||||
|
exec tablizer -c name,status -r -
|
||||||
|
stdout grafana.*Runn
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.txt --
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0 2/2 Running 35 (45m ago) 11d
|
||||||
|
grafana-fcc54cbc9-bk7s8 1/1 Running 17 (45m ago) 1d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7 1/1 Running 17 (45m ago) 1h44m
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f 1/1 Running 20 (45m ago) 45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl 1/1 Running 17 (45m ago) 54s
|
||||||
21
t/test-transpose.txtar
Normal file
21
t/test-transpose.txtar
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# transpose one field
|
||||||
|
exec tablizer -r testtable.txt -T status -R '/Running/OK/'
|
||||||
|
stdout grafana.*OK
|
||||||
|
|
||||||
|
# transpose two fields
|
||||||
|
exec tablizer -r testtable.txt -T name,status -R '/alertmanager-//' -R '/Running/OK/'
|
||||||
|
stdout prometheus-0.*OK
|
||||||
|
|
||||||
|
# transpose one field and show one column
|
||||||
|
exec tablizer -r testtable.txt -T status -R '/Running/OK/' -c name
|
||||||
|
! stdout grafana.*OK
|
||||||
|
|
||||||
|
|
||||||
|
# will be automatically created in work dir
|
||||||
|
-- testtable.txt --
|
||||||
|
NAME READY STATUS RESTARTS AGE
|
||||||
|
alertmanager-kube-prometheus-alertmanager-0 2/2 Running 35 (45m ago) 11d
|
||||||
|
grafana-fcc54cbc9-bk7s8 1/1 Running 17 (45m ago) 1d
|
||||||
|
kube-prometheus-blackbox-exporter-5d85b5d8f4-tskh7 1/1 Running 17 (45m ago) 1h44m
|
||||||
|
kube-prometheus-kube-state-metrics-b4cd9487-75p7f 1/1 Running 20 (45m ago) 45m
|
||||||
|
kube-prometheus-node-exporter-bfzpl 1/1 Running 17 (45m ago) 54s
|
||||||
45
t/test.sh
45
t/test.sh
@@ -1,45 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# simple commandline unit test script
|
|
||||||
|
|
||||||
t="../tablizer"
|
|
||||||
fail=0
|
|
||||||
|
|
||||||
ex() {
|
|
||||||
# execute a test, report+exit on error, stay silent otherwise
|
|
||||||
log="/tmp/test-tablizer.$$.log"
|
|
||||||
name=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
echo -n "TEST $name "
|
|
||||||
|
|
||||||
$* > $log 2>&1
|
|
||||||
|
|
||||||
if test $? -ne 0; then
|
|
||||||
echo "failed, see $log"
|
|
||||||
fail=1
|
|
||||||
else
|
|
||||||
echo "ok"
|
|
||||||
rm -f $log
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# only use files in test dir
|
|
||||||
cd $(dirname $0)
|
|
||||||
|
|
||||||
echo "Executing commandline tests ..."
|
|
||||||
|
|
||||||
# io pattern tests
|
|
||||||
ex io-pattern-and-file $t bk7 testtable.kube
|
|
||||||
cat testtable.kube | ex io-pattern-and-stdin $t bk7
|
|
||||||
cat testtable.kube | ex io-pattern-and-stdin-dash $t bk7 -
|
|
||||||
|
|
||||||
# same w/o pattern
|
|
||||||
ex io-just-file $t testtable.kube
|
|
||||||
cat testtable.kube | ex io-just-stdin $t
|
|
||||||
cat testtable.kube | ex io-just-stdin-dash $t -
|
|
||||||
|
|
||||||
if test $fail -ne 0; then
|
|
||||||
echo "!!! Some tests failed !!!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
6
t/testtable.csv
Normal file
6
t/testtable.csv
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
NAME,DURATION
|
||||||
|
x,10
|
||||||
|
a,100
|
||||||
|
z,0
|
||||||
|
u,4
|
||||||
|
k,6
|
||||||
|
6
t/testtable2
Normal file
6
t/testtable2
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
NAME DURATION
|
||||||
|
x 10
|
||||||
|
a 100
|
||||||
|
z 0
|
||||||
|
u 4
|
||||||
|
k 6
|
||||||
159
tablizer.1
159
tablizer.1
@@ -133,7 +133,7 @@
|
|||||||
.\" ========================================================================
|
.\" ========================================================================
|
||||||
.\"
|
.\"
|
||||||
.IX Title "TABLIZER 1"
|
.IX Title "TABLIZER 1"
|
||||||
.TH TABLIZER 1 "2023-01-23" "1" "User Commands"
|
.TH TABLIZER 1 "2025-01-14" "1" "User Commands"
|
||||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||||
.\" way too many mistakes in technical documents.
|
.\" way too many mistakes in technical documents.
|
||||||
.if n .ad l
|
.if n .ad l
|
||||||
@@ -147,34 +147,41 @@ tablizer \- Manipulate tabular output of other programs
|
|||||||
\& tablizer [regex] [file, ...] [flags]
|
\& tablizer [regex] [file, ...] [flags]
|
||||||
\&
|
\&
|
||||||
\& Operational Flags:
|
\& Operational Flags:
|
||||||
\& \-c, \-\-columns string Only show the speficied columns (separated by ,)
|
\& \-c, \-\-columns string Only show the speficied columns (separated by ,)
|
||||||
\& \-v, \-\-invert\-match select non\-matching rows
|
\& \-v, \-\-invert\-match select non\-matching rows
|
||||||
\& \-n, \-\-no\-numbering Disable header numbering
|
\& \-n, \-\-no\-numbering Disable header numbering
|
||||||
\& \-N, \-\-no\-color Disable pattern highlighting
|
\& \-N, \-\-no\-color Disable pattern highlighting
|
||||||
\& \-s, \-\-separator string Custom field separator
|
\& \-H, \-\-no\-headers Disable headers display
|
||||||
\& \-k, \-\-sort\-by int Sort by column (default: 1)
|
\& \-s, \-\-separator string Custom field separator
|
||||||
|
\& \-k, \-\-sort\-by int Sort by column (default: 1)
|
||||||
|
\& \-z, \-\-fuzzy Use fuzzy search [experimental]
|
||||||
|
\& \-F, \-\-filter field=reg Filter given field with regex, can be used multiple times
|
||||||
|
\& \-T, \-\-transpose\-columns string Transpose the speficied columns (separated by ,)
|
||||||
|
\& \-R, \-\-regex\-transposer /from/to/ Apply /search/replace/ regexp to fields given in \-T
|
||||||
\&
|
\&
|
||||||
\& Output Flags (mutually exclusive):
|
\& Output Flags (mutually exclusive):
|
||||||
\& \-X, \-\-extended Enable extended output
|
\& \-X, \-\-extended Enable extended output
|
||||||
\& \-M, \-\-markdown Enable markdown table output
|
\& \-M, \-\-markdown Enable markdown table output
|
||||||
\& \-O, \-\-orgtbl Enable org\-mode table output
|
\& \-O, \-\-orgtbl Enable org\-mode table output
|
||||||
\& \-S, \-\-shell Enable shell evaluable ouput
|
\& \-S, \-\-shell Enable shell evaluable output
|
||||||
\& \-Y, \-\-yaml Enable yaml output
|
\& \-Y, \-\-yaml Enable yaml output
|
||||||
\& \-C, \-\-csv Enable CSV output
|
\& \-C, \-\-csv Enable CSV output
|
||||||
\& \-A, \-\-ascii Default output mode, ascii tabular
|
\& \-A, \-\-ascii Default output mode, ascii tabular
|
||||||
|
\& \-L, \-\-hightlight\-lines Use alternating background colors for tables
|
||||||
\&
|
\&
|
||||||
\& Sort Mode Flags (mutually exclusive):
|
\& Sort Mode Flags (mutually exclusive):
|
||||||
\& \-a, \-\-sort\-age sort according to age (duration) string
|
\& \-a, \-\-sort\-age sort according to age (duration) string
|
||||||
\& \-D, \-\-sort\-desc Sort in descending order (default: ascending)
|
\& \-D, \-\-sort\-desc Sort in descending order (default: ascending)
|
||||||
\& \-i, \-\-sort\-numeric sort according to string numerical value
|
\& \-i, \-\-sort\-numeric sort according to string numerical value
|
||||||
\& \-t, \-\-sort\-time sort according to time string
|
\& \-t, \-\-sort\-time sort according to time string
|
||||||
\&
|
\&
|
||||||
\& Other Flags:
|
\& Other Flags:
|
||||||
\& \-\-completion <shell> Generate the autocompletion script for <shell>
|
\& \-\-completion <shell> Generate the autocompletion script for <shell>
|
||||||
\& \-d, \-\-debug Enable debugging
|
\& \-f, \-\-config <file> Configuration file (default: ~/.config/tablizer/config)
|
||||||
\& \-h, \-\-help help for tablizer
|
\& \-d, \-\-debug Enable debugging
|
||||||
\& \-m, \-\-man Display manual page
|
\& \-h, \-\-help help for tablizer
|
||||||
\& \-v, \-\-version Print program version
|
\& \-m, \-\-man Display manual page
|
||||||
|
\& \-V, \-\-version Print program version
|
||||||
.Ve
|
.Ve
|
||||||
.SH "DESCRIPTION"
|
.SH "DESCRIPTION"
|
||||||
.IX Header "DESCRIPTION"
|
.IX Header "DESCRIPTION"
|
||||||
@@ -234,6 +241,11 @@ the original order.
|
|||||||
.PP
|
.PP
|
||||||
The numbering can be suppressed by using the \fB\-n\fR option.
|
The numbering can be suppressed by using the \fB\-n\fR option.
|
||||||
.PP
|
.PP
|
||||||
|
By default tablizer shows a header containing the names of each
|
||||||
|
column. This can be disabled using the \fB\-H\fR option. Be aware that
|
||||||
|
this only affects tabular output modes. Shell, Extended, Yaml and \s-1CSV\s0
|
||||||
|
output modes always use the column names.
|
||||||
|
.PP
|
||||||
By default, if a \fBpattern\fR has been speficied, matches will be
|
By default, if a \fBpattern\fR has been speficied, matches will be
|
||||||
highlighted. You can disable this behavior with the \fB\-N\fR option.
|
highlighted. You can disable this behavior with the \fB\-N\fR option.
|
||||||
.PP
|
.PP
|
||||||
@@ -255,8 +267,8 @@ Sorts timestamps.
|
|||||||
.PP
|
.PP
|
||||||
Finally the \fB\-d\fR option enables debugging output which is mostly
|
Finally the \fB\-d\fR option enables debugging output which is mostly
|
||||||
useful for the developer.
|
useful for the developer.
|
||||||
.SS "\s-1PATTERNS\s0"
|
.SS "\s-1PATTERNS AND FILTERING\s0"
|
||||||
.IX Subsection "PATTERNS"
|
.IX Subsection "PATTERNS AND FILTERING"
|
||||||
You can reduce the rows being displayed by using a regular expression
|
You can reduce the rows being displayed by using a regular expression
|
||||||
pattern. The regexp is \s-1PCRE\s0 compatible, refer to the syntax cheat
|
pattern. The regexp is \s-1PCRE\s0 compatible, refer to the syntax cheat
|
||||||
sheet here: <https://github.com/google/re2/wiki/Syntax>. If you want
|
sheet here: <https://github.com/google/re2/wiki/Syntax>. If you want
|
||||||
@@ -287,6 +299,25 @@ Example for a case insensitive search:
|
|||||||
.Vb 1
|
.Vb 1
|
||||||
\& kubectl get pods \-A | tablizer "(?i)account"
|
\& kubectl get pods \-A | tablizer "(?i)account"
|
||||||
.Ve
|
.Ve
|
||||||
|
.PP
|
||||||
|
You can use the experimental fuzzy search feature by providing the
|
||||||
|
option \fB\-z\fR, in which case the pattern is regarded as a fuzzy search
|
||||||
|
term, not a regexp.
|
||||||
|
.PP
|
||||||
|
Sometimes you want to filter by one or more columns. You can do that
|
||||||
|
using the \fB\-F\fR option. The option can be specified multiple times and
|
||||||
|
has the following format:
|
||||||
|
.PP
|
||||||
|
.Vb 1
|
||||||
|
\& fieldname=regexp
|
||||||
|
.Ve
|
||||||
|
.PP
|
||||||
|
Fieldnames (== columns headers) are case insensitive.
|
||||||
|
.PP
|
||||||
|
If you specify more than one filter, both filters have to match (\s-1AND\s0
|
||||||
|
operation).
|
||||||
|
.PP
|
||||||
|
If the option \fB\-v\fR is specified, the filtering is inverted.
|
||||||
.SS "\s-1COLUMNS\s0"
|
.SS "\s-1COLUMNS\s0"
|
||||||
.IX Subsection "COLUMNS"
|
.IX Subsection "COLUMNS"
|
||||||
The parameter \fB\-c\fR can be used to specify, which columns to
|
The parameter \fB\-c\fR can be used to specify, which columns to
|
||||||
@@ -319,6 +350,50 @@ We want to see only the \s-1CMD\s0 column and use a regex for this:
|
|||||||
.Ve
|
.Ve
|
||||||
.PP
|
.PP
|
||||||
where \*(L"C\*(R" is our regexp which matches \s-1CMD.\s0
|
where \*(L"C\*(R" is our regexp which matches \s-1CMD.\s0
|
||||||
|
.PP
|
||||||
|
If a column specifier doesn't look like a regular expression, matching
|
||||||
|
against header fields will be case insensitive. So, if you have a
|
||||||
|
field with the name \f(CW\*(C`ID\*(C'\fR then these will all match: \f(CW\*(C`\-c id\*(C'\fR, \f(CW\*(C`\-c
|
||||||
|
Id\*(C'\fR. The same rule applies to the options \f(CW\*(C`\-T\*(C'\fR and \f(CW\*(C`\-F\*(C'\fR.
|
||||||
|
.SS "\s-1TRANSPOSE FIELDS USING REGEXPS\s0"
|
||||||
|
.IX Subsection "TRANSPOSE FIELDS USING REGEXPS"
|
||||||
|
You can manipulate field contents using regular expressions. You have
|
||||||
|
to tell tablizer which field[s] to operate on using the option \f(CW\*(C`\-T\*(C'\fR
|
||||||
|
and the search/replace pattern using \f(CW\*(C`\-R\*(C'\fR. The number of columns and
|
||||||
|
patterns must match.
|
||||||
|
.PP
|
||||||
|
A search/replace pattern consists of the following elements:
|
||||||
|
.PP
|
||||||
|
.Vb 1
|
||||||
|
\& /search\-regexp/replace\-string/
|
||||||
|
.Ve
|
||||||
|
.PP
|
||||||
|
The separator can be any valid character. Especially if you want to
|
||||||
|
use a regexp containing the \f(CW\*(C`/\*(C'\fR character, eg:
|
||||||
|
.PP
|
||||||
|
.Vb 1
|
||||||
|
\& |search\-regexp|replace\-string|
|
||||||
|
.Ve
|
||||||
|
.PP
|
||||||
|
Example:
|
||||||
|
.PP
|
||||||
|
.Vb 7
|
||||||
|
\& cat t/testtable2
|
||||||
|
\& NAME DURATION
|
||||||
|
\& x 10
|
||||||
|
\& a 100
|
||||||
|
\& z 0
|
||||||
|
\& u 4
|
||||||
|
\& k 6
|
||||||
|
\&
|
||||||
|
\& cat t/testtable2 | tablizer \-T2 \-R \*(Aq/^\ed/4/\*(Aq \-n
|
||||||
|
\& NAME DURATION
|
||||||
|
\& x 40
|
||||||
|
\& a 400
|
||||||
|
\& z 4
|
||||||
|
\& u 4
|
||||||
|
\& k 4
|
||||||
|
.Ve
|
||||||
.SS "\s-1OUTPUT MODES\s0"
|
.SS "\s-1OUTPUT MODES\s0"
|
||||||
.IX Subsection "OUTPUT MODES"
|
.IX Subsection "OUTPUT MODES"
|
||||||
There might be cases when the tabular output of a program is way too
|
There might be cases when the tabular output of a program is way too
|
||||||
@@ -433,6 +508,38 @@ To load completions for every new session, run:
|
|||||||
.Ve
|
.Ve
|
||||||
.Sp
|
.Sp
|
||||||
and source this file from your PowerShell profile.
|
and source this file from your PowerShell profile.
|
||||||
|
.SH "CONFIGURATION AND COLORS"
|
||||||
|
.IX Header "CONFIGURATION AND COLORS"
|
||||||
|
YOu can put certain configuration values into a configuration file in
|
||||||
|
\&\s-1HCL\s0 format. By default tablizer looks for
|
||||||
|
\&\f(CW\*(C`$HOME/.config/tablizer/config\*(C'\fR, but you can provide one using the
|
||||||
|
parameter \f(CW\*(C`\-f\*(C'\fR.
|
||||||
|
.PP
|
||||||
|
In the configuration the following variables can be defined:
|
||||||
|
.PP
|
||||||
|
.Vb 8
|
||||||
|
\& BG = "lightGreen"
|
||||||
|
\& FG = "white"
|
||||||
|
\& HighlightBG = "lightGreen"
|
||||||
|
\& HighlightFG = "white"
|
||||||
|
\& NoHighlightBG = "white"
|
||||||
|
\& NoHighlightFG = "lightGreen"
|
||||||
|
\& HighlightHdrBG = "red"
|
||||||
|
\& HighlightHdrFG = "white"
|
||||||
|
.Ve
|
||||||
|
.PP
|
||||||
|
The following color definitions are available:
|
||||||
|
.PP
|
||||||
|
black, blue, cyan, darkGray, default, green, lightBlue, lightCyan,
|
||||||
|
lightGreen, lightMagenta, lightRed, lightWhite, lightYellow,
|
||||||
|
magenta, red, white, yellow
|
||||||
|
.PP
|
||||||
|
The Variables \fB\s-1FG\s0\fR and \fB\s-1BG\s0\fR are being used to highlight matches. The
|
||||||
|
other *FG and *BG variables are for colored table output (enabled with
|
||||||
|
the \f(CW\*(C`\-L\*(C'\fR parameter).
|
||||||
|
.PP
|
||||||
|
Colorization can be turned off completely either by setting the
|
||||||
|
parameter \f(CW\*(C`\-N\*(C'\fR or the environment variable \fB\s-1NO_COLOR\s0\fR to a true value.
|
||||||
.SH "BUGS"
|
.SH "BUGS"
|
||||||
.IX Header "BUGS"
|
.IX Header "BUGS"
|
||||||
In order to report a bug, unexpected behavior, feature requests
|
In order to report a bug, unexpected behavior, feature requests
|
||||||
@@ -442,7 +549,7 @@ or to submit a patch, please open an issue on github:
|
|||||||
.IX Header "LICENSE"
|
.IX Header "LICENSE"
|
||||||
This software is licensed under the \s-1GNU GENERAL PUBLIC LICENSE\s0 version 3.
|
This software is licensed under the \s-1GNU GENERAL PUBLIC LICENSE\s0 version 3.
|
||||||
.PP
|
.PP
|
||||||
Copyright (c) 2023 by Thomas von Dein
|
Copyright (c) 2022\-2024 by Thomas von Dein
|
||||||
.PP
|
.PP
|
||||||
This software uses the following \s-1GO\s0 modules:
|
This software uses the following \s-1GO\s0 modules:
|
||||||
.IP "repr (https://github.com/alecthomas/repr)" 4
|
.IP "repr (https://github.com/alecthomas/repr)" 4
|
||||||
|
|||||||
150
tablizer.pod
150
tablizer.pod
@@ -8,34 +8,41 @@ tablizer - Manipulate tabular output of other programs
|
|||||||
tablizer [regex] [file, ...] [flags]
|
tablizer [regex] [file, ...] [flags]
|
||||||
|
|
||||||
Operational Flags:
|
Operational Flags:
|
||||||
-c, --columns string Only show the speficied columns (separated by ,)
|
-c, --columns string Only show the speficied columns (separated by ,)
|
||||||
-v, --invert-match select non-matching rows
|
-v, --invert-match select non-matching rows
|
||||||
-n, --no-numbering Disable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-s, --separator string Custom field separator
|
-H, --no-headers Disable headers display
|
||||||
-k, --sort-by int Sort by column (default: 1)
|
-s, --separator string Custom field separator
|
||||||
|
-k, --sort-by int Sort by column (default: 1)
|
||||||
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
-M, --markdown Enable markdown table output
|
-M, --markdown Enable markdown table output
|
||||||
-O, --orgtbl Enable org-mode table output
|
-O, --orgtbl Enable org-mode table output
|
||||||
-S, --shell Enable shell evaluable ouput
|
-S, --shell Enable shell evaluable output
|
||||||
-Y, --yaml Enable yaml output
|
-Y, --yaml Enable yaml output
|
||||||
-C, --csv Enable CSV output
|
-C, --csv Enable CSV output
|
||||||
-A, --ascii Default output mode, ascii tabular
|
-A, --ascii Default output mode, ascii tabular
|
||||||
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
|
|
||||||
Sort Mode Flags (mutually exclusive):
|
Sort Mode Flags (mutually exclusive):
|
||||||
-a, --sort-age sort according to age (duration) string
|
-a, --sort-age sort according to age (duration) string
|
||||||
-D, --sort-desc Sort in descending order (default: ascending)
|
-D, --sort-desc Sort in descending order (default: ascending)
|
||||||
-i, --sort-numeric sort according to string numerical value
|
-i, --sort-numeric sort according to string numerical value
|
||||||
-t, --sort-time sort according to time string
|
-t, --sort-time sort according to time string
|
||||||
|
|
||||||
Other Flags:
|
Other Flags:
|
||||||
--completion <shell> Generate the autocompletion script for <shell>
|
--completion <shell> Generate the autocompletion script for <shell>
|
||||||
-d, --debug Enable debugging
|
-f, --config <file> Configuration file (default: ~/.config/tablizer/config)
|
||||||
-h, --help help for tablizer
|
-d, --debug Enable debugging
|
||||||
-m, --man Display manual page
|
-h, --help help for tablizer
|
||||||
-v, --version Print program version
|
-m, --man Display manual page
|
||||||
|
-V, --version Print program version
|
||||||
|
|
||||||
|
|
||||||
=head1 DESCRIPTION
|
=head1 DESCRIPTION
|
||||||
@@ -90,6 +97,11 @@ the original order.
|
|||||||
|
|
||||||
The numbering can be suppressed by using the B<-n> option.
|
The numbering can be suppressed by using the B<-n> option.
|
||||||
|
|
||||||
|
By default tablizer shows a header containing the names of each
|
||||||
|
column. This can be disabled using the B<-H> option. Be aware that
|
||||||
|
this only affects tabular output modes. Shell, Extended, Yaml and CSV
|
||||||
|
output modes always use the column names.
|
||||||
|
|
||||||
By default, if a B<pattern> has been speficied, matches will be
|
By default, if a B<pattern> has been speficied, matches will be
|
||||||
highlighted. You can disable this behavior with the B<-N> option.
|
highlighted. You can disable this behavior with the B<-N> option.
|
||||||
|
|
||||||
@@ -119,7 +131,7 @@ Sorts timestamps.
|
|||||||
Finally the B<-d> option enables debugging output which is mostly
|
Finally the B<-d> option enables debugging output which is mostly
|
||||||
useful for the developer.
|
useful for the developer.
|
||||||
|
|
||||||
=head2 PATTERNS
|
=head2 PATTERNS AND FILTERING
|
||||||
|
|
||||||
You can reduce the rows being displayed by using a regular expression
|
You can reduce the rows being displayed by using a regular expression
|
||||||
pattern. The regexp is PCRE compatible, refer to the syntax cheat
|
pattern. The regexp is PCRE compatible, refer to the syntax cheat
|
||||||
@@ -146,6 +158,23 @@ Example for a case insensitive search:
|
|||||||
|
|
||||||
kubectl get pods -A | tablizer "(?i)account"
|
kubectl get pods -A | tablizer "(?i)account"
|
||||||
|
|
||||||
|
You can use the experimental fuzzy search feature by providing the
|
||||||
|
option B<-z>, in which case the pattern is regarded as a fuzzy search
|
||||||
|
term, not a regexp.
|
||||||
|
|
||||||
|
Sometimes you want to filter by one or more columns. You can do that
|
||||||
|
using the B<-F> option. The option can be specified multiple times and
|
||||||
|
has the following format:
|
||||||
|
|
||||||
|
fieldname=regexp
|
||||||
|
|
||||||
|
Fieldnames (== columns headers) are case insensitive.
|
||||||
|
|
||||||
|
If you specify more than one filter, both filters have to match (AND
|
||||||
|
operation).
|
||||||
|
|
||||||
|
If the option B<-v> is specified, the filtering is inverted.
|
||||||
|
|
||||||
|
|
||||||
=head2 COLUMNS
|
=head2 COLUMNS
|
||||||
|
|
||||||
@@ -176,6 +205,46 @@ We want to see only the CMD column and use a regex for this:
|
|||||||
|
|
||||||
where "C" is our regexp which matches CMD.
|
where "C" is our regexp which matches CMD.
|
||||||
|
|
||||||
|
If a column specifier doesn't look like a regular expression, matching
|
||||||
|
against header fields will be case insensitive. So, if you have a
|
||||||
|
field with the name C<ID> then these will all match: C<-c id>, C<-c
|
||||||
|
Id>. The same rule applies to the options C<-T> and C<-F>.
|
||||||
|
|
||||||
|
|
||||||
|
=head2 TRANSPOSE FIELDS USING REGEXPS
|
||||||
|
|
||||||
|
You can manipulate field contents using regular expressions. You have
|
||||||
|
to tell tablizer which field[s] to operate on using the option C<-T>
|
||||||
|
and the search/replace pattern using C<-R>. The number of columns and
|
||||||
|
patterns must match.
|
||||||
|
|
||||||
|
A search/replace pattern consists of the following elements:
|
||||||
|
|
||||||
|
/search-regexp/replace-string/
|
||||||
|
|
||||||
|
The separator can be any valid character. Especially if you want to
|
||||||
|
use a regexp containing the C</> character, eg:
|
||||||
|
|
||||||
|
|search-regexp|replace-string|
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
cat t/testtable2
|
||||||
|
NAME DURATION
|
||||||
|
x 10
|
||||||
|
a 100
|
||||||
|
z 0
|
||||||
|
u 4
|
||||||
|
k 6
|
||||||
|
|
||||||
|
cat t/testtable2 | tablizer -T2 -R '/^\d/4/' -n
|
||||||
|
NAME DURATION
|
||||||
|
x 40
|
||||||
|
a 400
|
||||||
|
z 4
|
||||||
|
u 4
|
||||||
|
k 4
|
||||||
|
|
||||||
=head2 OUTPUT MODES
|
=head2 OUTPUT MODES
|
||||||
|
|
||||||
There might be cases when the tabular output of a program is way too
|
There might be cases when the tabular output of a program is way too
|
||||||
@@ -283,6 +352,39 @@ and source this file from your PowerShell profile.
|
|||||||
|
|
||||||
=back
|
=back
|
||||||
|
|
||||||
|
=head1 CONFIGURATION AND COLORS
|
||||||
|
|
||||||
|
YOu can put certain configuration values into a configuration file in
|
||||||
|
HCL format. By default tablizer looks for
|
||||||
|
C<$HOME/.config/tablizer/config>, but you can provide one using the
|
||||||
|
parameter C<-f>.
|
||||||
|
|
||||||
|
In the configuration the following variables can be defined:
|
||||||
|
|
||||||
|
BG = "lightGreen"
|
||||||
|
FG = "white"
|
||||||
|
HighlightBG = "lightGreen"
|
||||||
|
HighlightFG = "white"
|
||||||
|
NoHighlightBG = "white"
|
||||||
|
NoHighlightFG = "lightGreen"
|
||||||
|
HighlightHdrBG = "red"
|
||||||
|
HighlightHdrFG = "white"
|
||||||
|
|
||||||
|
The following color definitions are available:
|
||||||
|
|
||||||
|
black, blue, cyan, darkGray, default, green, lightBlue, lightCyan,
|
||||||
|
lightGreen, lightMagenta, lightRed, lightWhite, lightYellow,
|
||||||
|
magenta, red, white, yellow
|
||||||
|
|
||||||
|
The Variables B<FG> and B<BG> are being used to highlight matches. The
|
||||||
|
other *FG and *BG variables are for colored table output (enabled with
|
||||||
|
the C<-L> parameter).
|
||||||
|
|
||||||
|
Colorization can be turned off completely either by setting the
|
||||||
|
parameter C<-N> or the environment variable B<NO_COLOR> to a true value.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=head1 BUGS
|
=head1 BUGS
|
||||||
|
|
||||||
In order to report a bug, unexpected behavior, feature requests
|
In order to report a bug, unexpected behavior, feature requests
|
||||||
@@ -293,7 +395,7 @@ L<https://github.com/TLINDEN/tablizer/issues>.
|
|||||||
|
|
||||||
This software is licensed under the GNU GENERAL PUBLIC LICENSE version 3.
|
This software is licensed under the GNU GENERAL PUBLIC LICENSE version 3.
|
||||||
|
|
||||||
Copyright (c) 2023 by Thomas von Dein
|
Copyright (c) 2022-2024 by Thomas von Dein
|
||||||
|
|
||||||
This software uses the following GO modules:
|
This software uses the following GO modules:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user