mirror of
https://codeberg.org/scip/tablizer.git
synced 2025-12-19 13:31:02 +01:00
Compare commits
4 Commits
v1.5.1
...
feature/mu
| Author | SHA1 | Date | |
|---|---|---|---|
| 479d8c274a | |||
| a49e28518b | |||
| e29e72b7d2 | |||
| f6e3075ea8 |
12
.github/workflows/ci.yaml
vendored
12
.github/workflows/ci.yaml
vendored
@@ -4,8 +4,10 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
version: ['1.23']
|
version: ['1.22']
|
||||||
os: [ubuntu-latest, macos-latest, windows-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:
|
||||||
@@ -16,7 +18,7 @@ jobs:
|
|||||||
id: go
|
id: go
|
||||||
|
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: build
|
- name: build
|
||||||
run: make
|
run: make
|
||||||
@@ -30,8 +32,8 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-go@v5
|
- uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: 1.23
|
go-version: 1.22
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v4
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v6
|
uses: golangci/golangci-lint-action@v6
|
||||||
with:
|
with:
|
||||||
|
|||||||
63
.github/workflows/release.yaml
vendored
63
.github/workflows/release.yaml
vendored
@@ -1,8 +1,8 @@
|
|||||||
name: build-release
|
name: build-and-test
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- "v*.*.*"
|
- "*"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -10,10 +10,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v5
|
uses: actions/setup-go@v1
|
||||||
with:
|
with:
|
||||||
go-version: 1.22.11
|
go-version: 1.22.11
|
||||||
|
|
||||||
@@ -30,58 +30,3 @@ jobs:
|
|||||||
tag: ${{ github.ref_name }}
|
tag: ${{ github.ref_name }}
|
||||||
file: ./releases/*
|
file: ./releases/*
|
||||||
file_glob: true
|
file_glob: true
|
||||||
|
|
||||||
- name: Build Changelog
|
|
||||||
id: github_release
|
|
||||||
uses: mikepenz/release-changelog-builder-action@v5
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
mode: "PR"
|
|
||||||
configurationJson: |
|
|
||||||
{
|
|
||||||
"template": "#{{CHANGELOG}}\n\n**Full Changelog**: #{{RELEASE_DIFF}}",
|
|
||||||
"pr_template": "- #{{TITLE}} (##{{NUMBER}}) by #{{AUTHOR}}\n#{{BODY}}",
|
|
||||||
"empty_template": "- no changes",
|
|
||||||
"categories": [
|
|
||||||
{
|
|
||||||
"title": "## New Features",
|
|
||||||
"labels": ["add", "feature"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "## Bug Fixes",
|
|
||||||
"labels": ["fix", "bug", "revert"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "## Documentation Enhancements",
|
|
||||||
"labels": ["doc"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "## Refactoring Efforts",
|
|
||||||
"labels": ["refactor"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"title": "## Miscellaneus Changes",
|
|
||||||
"labels": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"ignore_labels": [
|
|
||||||
"duplicate", "good first issue", "help wanted", "invalid", "question", "wontfix"
|
|
||||||
],
|
|
||||||
"label_extractor": [
|
|
||||||
{
|
|
||||||
"pattern": "(.) (.+)",
|
|
||||||
"target": "$1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern": "(.) (.+)",
|
|
||||||
"target": "$1",
|
|
||||||
"on_property": "title"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
- name: Create Release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
body: ${{steps.github_release.outputs.changelog}}
|
|
||||||
|
|||||||
4
Makefile
4
Makefile
@@ -64,12 +64,12 @@ install: buildlocal
|
|||||||
clean:
|
clean:
|
||||||
rm -rf $(tool) releases coverage.out
|
rm -rf $(tool) releases coverage.out
|
||||||
|
|
||||||
test: clean
|
test:
|
||||||
go test ./... $(OPTS)
|
go test ./... $(OPTS)
|
||||||
|
|
||||||
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) $(OPTS)
|
go test -run $(TEST) github.com/tlinden/tablizer/$(MOD)
|
||||||
|
|
||||||
cover-report:
|
cover-report:
|
||||||
go test ./... -cover -coverprofile=coverage.out
|
go test ./... -cover -coverprofile=coverage.out
|
||||||
|
|||||||
16
README.md
16
README.md
@@ -6,29 +6,25 @@
|
|||||||
|
|
||||||
Tablizer can be used to re-format tabular output of other
|
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. With tablizer you can filter by column[s],
|
cases it's a hard job.
|
||||||
ignore certain column[s] by regex, name or number. It can output the
|
|
||||||
tabular data in a range of formats (see below). There's even an
|
|
||||||
interactive filter/selection tool available.
|
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
```default
|
```default
|
||||||
Usage:
|
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, --numbering Enable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-H, --no-headers Disable headers display
|
-H, --no-headers Disable headers display
|
||||||
-s, --separator string Custom field separator
|
-s, --separator string Custom field separator
|
||||||
-k, --sort-by int|name Sort by column (default: 1)
|
-k, --sort-by int Sort by column (default: 1)
|
||||||
-z, --fuzzy Use fuzzy search [experimental]
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
-F, --filter field[!]=reg Filter given field with regex, can be used multiple times
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
-I, --interactive Interactively filter and select rows
|
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
@@ -39,8 +35,6 @@ Output Flags (mutually exclusive):
|
|||||||
-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
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
-y, --yank-columns Yank specified columns (separated by ,) to clipboard,
|
|
||||||
space separated
|
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022-2025 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
|
||||||
@@ -28,7 +28,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const DefaultSeparator string = `(\s\s+|\t)`
|
const DefaultSeparator string = `(\s\s+|\t)`
|
||||||
const Version string = "v1.5.1"
|
const Version string = "v1.3.1"
|
||||||
const MAXPARTS = 2
|
const MAXPARTS = 2
|
||||||
|
|
||||||
var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config"
|
var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config"
|
||||||
@@ -58,27 +58,19 @@ type Pattern struct {
|
|||||||
Negate bool
|
Negate bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type Filter struct {
|
|
||||||
Regex *regexp.Regexp
|
|
||||||
Negate bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// internal config
|
// internal config
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Debug bool
|
Debug bool
|
||||||
Numbering bool
|
NoNumbering bool
|
||||||
NoHeaders bool
|
NoHeaders bool
|
||||||
Columns string
|
Columns string
|
||||||
UseColumns []int
|
UseColumns []int
|
||||||
YankColumns string
|
|
||||||
UseYankColumns []int
|
|
||||||
Separator string
|
Separator string
|
||||||
OutputMode int
|
OutputMode int
|
||||||
InvertMatch bool
|
InvertMatch bool
|
||||||
Patterns []*Pattern
|
Patterns []*Pattern
|
||||||
UseFuzzySearch bool
|
UseFuzzySearch bool
|
||||||
UseHighlight bool
|
UseHighlight bool
|
||||||
Interactive bool
|
|
||||||
|
|
||||||
SortMode string
|
SortMode string
|
||||||
SortDescending bool
|
SortDescending bool
|
||||||
@@ -108,7 +100,7 @@ type Config struct {
|
|||||||
|
|
||||||
// used for field filtering
|
// used for field filtering
|
||||||
Rawfilters []string
|
Rawfilters []string
|
||||||
Filters map[string]Filter //map[string]*regexp.Regexp
|
Filters map[string]*regexp.Regexp
|
||||||
|
|
||||||
// -r <file>
|
// -r <file>
|
||||||
InputFile string
|
InputFile string
|
||||||
@@ -278,20 +270,12 @@ func (conf *Config) PrepareModeFlags(flag Modeflag) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (conf *Config) PrepareFilters() error {
|
func (conf *Config) PrepareFilters() error {
|
||||||
conf.Filters = make(map[string]Filter, len(conf.Rawfilters))
|
conf.Filters = make(map[string]*regexp.Regexp, len(conf.Rawfilters))
|
||||||
|
|
||||||
for _, rawfilter := range conf.Rawfilters {
|
for _, filter := range conf.Rawfilters {
|
||||||
filter := Filter{}
|
parts := strings.Split(filter, "=")
|
||||||
|
|
||||||
parts := strings.Split(rawfilter, "!=")
|
|
||||||
if len(parts) != MAXPARTS {
|
if len(parts) != MAXPARTS {
|
||||||
parts = strings.Split(rawfilter, "=")
|
return errors.New("filter field and value must be separated by =")
|
||||||
|
|
||||||
if len(parts) != MAXPARTS {
|
|
||||||
return errors.New("filter field and value must be separated by '=' or '!='")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
filter.Negate = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
reg, err := regexp.Compile(parts[1])
|
reg, err := regexp.Compile(parts[1])
|
||||||
@@ -300,8 +284,7 @@ func (conf *Config) PrepareFilters() error {
|
|||||||
parts[0], err)
|
parts[0], err)
|
||||||
}
|
}
|
||||||
|
|
||||||
filter.Regex = reg
|
conf.Filters[strings.ToLower(strings.ToLower(parts[0]))] = reg
|
||||||
conf.Filters[strings.ToLower(parts[0])] = filter
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -333,10 +316,10 @@ func (conf *Config) PrepareTransposers() error {
|
|||||||
func (conf *Config) CheckEnv() {
|
func (conf *Config) CheckEnv() {
|
||||||
// check for environment vars, command line flags have precedence,
|
// check for environment vars, command line flags have precedence,
|
||||||
// NO_COLOR is being checked by the color module itself.
|
// NO_COLOR is being checked by the color module itself.
|
||||||
if !conf.Numbering {
|
if !conf.NoNumbering {
|
||||||
_, set := os.LookupEnv("T_HEADER_NUMBERING")
|
_, set := os.LookupEnv("T_NO_HEADER_NUMBERING")
|
||||||
if set {
|
if set {
|
||||||
conf.Numbering = true
|
conf.NoNumbering = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -351,7 +334,7 @@ func (conf *Config) CheckEnv() {
|
|||||||
func (conf *Config) ApplyDefaults() {
|
func (conf *Config) ApplyDefaults() {
|
||||||
// mode specific defaults
|
// mode specific defaults
|
||||||
if conf.OutputMode == Yaml || conf.OutputMode == CSV {
|
if conf.OutputMode == Yaml || conf.OutputMode == CSV {
|
||||||
conf.Numbering = false
|
conf.NoNumbering = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
33
cmd/root.go
33
cmd/root.go
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022-2025 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
|
||||||
@@ -17,9 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
@@ -27,6 +30,24 @@ import (
|
|||||||
"github.com/tlinden/tablizer/lib"
|
"github.com/tlinden/tablizer/lib"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func man() {
|
||||||
|
man := exec.Command("less", "-")
|
||||||
|
|
||||||
|
var buffer bytes.Buffer
|
||||||
|
|
||||||
|
buffer.Write([]byte(manpage))
|
||||||
|
|
||||||
|
man.Stdout = os.Stdout
|
||||||
|
man.Stdin = &buffer
|
||||||
|
man.Stderr = os.Stderr
|
||||||
|
|
||||||
|
err := man.Run()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func completion(cmd *cobra.Command, mode string) error {
|
func completion(cmd *cobra.Command, mode string) error {
|
||||||
switch mode {
|
switch mode {
|
||||||
case "bash":
|
case "bash":
|
||||||
@@ -73,7 +94,7 @@ func Execute() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ShowManual {
|
if ShowManual {
|
||||||
lib.Pager("tablizer manual page", manpage)
|
man()
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -104,7 +125,7 @@ func Execute() {
|
|||||||
// options
|
// options
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.Debug, "debug", "d", false,
|
rootCmd.PersistentFlags().BoolVarP(&conf.Debug, "debug", "d", false,
|
||||||
"Enable debugging")
|
"Enable debugging")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.Numbering, "numbering", "n", false,
|
rootCmd.PersistentFlags().BoolVarP(&conf.NoNumbering, "no-numbering", "n", false,
|
||||||
"Disable header numbering")
|
"Disable header numbering")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.NoHeaders, "no-headers", "H", false,
|
rootCmd.PersistentFlags().BoolVarP(&conf.NoHeaders, "no-headers", "H", false,
|
||||||
"Disable header display")
|
"Disable header display")
|
||||||
@@ -126,12 +147,8 @@ func Execute() {
|
|||||||
"Custom field separator")
|
"Custom field separator")
|
||||||
rootCmd.PersistentFlags().StringVarP(&conf.Columns, "columns", "c", "",
|
rootCmd.PersistentFlags().StringVarP(&conf.Columns, "columns", "c", "",
|
||||||
"Only show the speficied columns (separated by ,)")
|
"Only show the speficied columns (separated by ,)")
|
||||||
rootCmd.PersistentFlags().StringVarP(&conf.YankColumns, "yank-columns", "y", "",
|
|
||||||
"Yank the speficied columns (separated by ,) to the clipboard")
|
|
||||||
rootCmd.PersistentFlags().StringVarP(&conf.TransposeColumns, "transpose-columns", "T", "",
|
rootCmd.PersistentFlags().StringVarP(&conf.TransposeColumns, "transpose-columns", "T", "",
|
||||||
"Transpose the speficied columns (separated by ,)")
|
"Transpose the speficied columns (separated by ,)")
|
||||||
rootCmd.PersistentFlags().BoolVarP(&conf.Interactive, "interactive", "I", false,
|
|
||||||
"interactive mode (experimental)")
|
|
||||||
|
|
||||||
// sort options
|
// sort options
|
||||||
rootCmd.PersistentFlags().StringVarP(&conf.SortByColumn, "sort-by", "k", "",
|
rootCmd.PersistentFlags().StringVarP(&conf.SortByColumn, "sort-by", "k", "",
|
||||||
@@ -173,7 +190,7 @@ func Execute() {
|
|||||||
|
|
||||||
// filters
|
// filters
|
||||||
rootCmd.PersistentFlags().StringArrayVarP(&conf.Rawfilters,
|
rootCmd.PersistentFlags().StringArrayVarP(&conf.Rawfilters,
|
||||||
"filter", "F", nil, "Filter by field (field=regexp || field!=regexp)")
|
"filter", "F", nil, "Filter by field (field=regexp)")
|
||||||
rootCmd.PersistentFlags().StringArrayVarP(&conf.Transposers,
|
rootCmd.PersistentFlags().StringArrayVarP(&conf.Transposers,
|
||||||
"regex-transposer", "R", nil, "apply /search/replace/ regexp to fields given in -T")
|
"regex-transposer", "R", nil, "apply /search/replace/ regexp to fields given in -T")
|
||||||
|
|
||||||
|
|||||||
@@ -11,16 +11,15 @@ SYNOPSIS
|
|||||||
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, --numbering Enable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-H, --no-headers Disable headers display
|
-H, --no-headers Disable headers display
|
||||||
-s, --separator string Custom field separator
|
-s, --separator string Custom field separator
|
||||||
-k, --sort-by int|name Sort by column (default: 1)
|
-k, --sort-by int|name Sort by column (default: 1)
|
||||||
-z, --fuzzy Use fuzzy search [experimental]
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
-F, --filter field[!]=reg Filter given field with regex, can be used multiple times
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
-I, --interactive Interactively filter and select rows
|
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
@@ -31,8 +30,6 @@ SYNOPSIS
|
|||||||
-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
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
-y, --yank-columns Yank specified columns (separated by ,) to clipboard,
|
|
||||||
space separated
|
|
||||||
|
|
||||||
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
|
||||||
@@ -184,26 +181,8 @@ DESCRIPTION
|
|||||||
If you specify more than one filter, both filters have to match (AND
|
If you specify more than one filter, both filters have to match (AND
|
||||||
operation).
|
operation).
|
||||||
|
|
||||||
These field filters can also be negated:
|
|
||||||
|
|
||||||
fieldname!=regexp
|
|
||||||
|
|
||||||
If the option -v is specified, the filtering is inverted.
|
If the option -v is specified, the filtering is inverted.
|
||||||
|
|
||||||
INTERACTIVE FILTERING
|
|
||||||
You can also use the interactive mode, enabled with "-I" to filter and
|
|
||||||
select rows. This mode is complementary, that is, other filter options
|
|
||||||
are still being respected.
|
|
||||||
|
|
||||||
To enter e filter, hit "/", enter a filter string and finish with
|
|
||||||
"ENTER". Use "SPACE" to select/deselect rows, use "a" to select all
|
|
||||||
(visible) rows.
|
|
||||||
|
|
||||||
Commit your selection with "q". The selected rows are being fed to the
|
|
||||||
requested output mode as usual. Abort with "CTRL-c", in which case the
|
|
||||||
results of the interactive mode are being ignored and all rows are being
|
|
||||||
fed to output.
|
|
||||||
|
|
||||||
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
|
||||||
@@ -301,24 +280,12 @@ DESCRIPTION
|
|||||||
markdown which prints a Markdown table, yaml, which prints yaml encoding
|
markdown which prints a Markdown table, yaml, which prints yaml encoding
|
||||||
and CSV mode, which prints a comma separated value file.
|
and CSV mode, which prints a comma separated value file.
|
||||||
|
|
||||||
PUT FIELDS TO CLIPBOARD
|
|
||||||
You can let tablizer put fields to the clipboard using the option "-y".
|
|
||||||
This best fits the use-case when the result of your filtering yields
|
|
||||||
just one row. For example:
|
|
||||||
|
|
||||||
cloudctl cluster ls | tablizer -yid matchbox
|
|
||||||
|
|
||||||
If "matchbox" matches one cluster, you can immediately use the id of
|
|
||||||
that cluster somewhere else and paste it. Of course, if there are
|
|
||||||
multiple matches, then all id's will be put into the clipboard separated
|
|
||||||
by one space.
|
|
||||||
|
|
||||||
ENVIRONMENT VARIABLES
|
ENVIRONMENT VARIABLES
|
||||||
tablizer supports certain environment variables which use can use to
|
tablizer supports certain environment variables which use can use to
|
||||||
influence program behavior. Commandline flags have always precedence
|
influence program behavior. Commandline flags have always precedence
|
||||||
over environment variables.
|
over environment variables.
|
||||||
|
|
||||||
<T_HEADER_NUMBERING> - enable numbering of header fields, like -n.
|
<T_NO_HEADER_NUMBERING> - disable numbering of header fields, like -n.
|
||||||
<T_COLUMNS> - comma separated list of columns to output, like -c
|
<T_COLUMNS> - comma separated list of columns to output, like -c
|
||||||
<NO_COLORS> - disable colorization of matches, like -N
|
<NO_COLORS> - disable colorization of matches, like -N
|
||||||
|
|
||||||
@@ -431,9 +398,6 @@ LICENSE
|
|||||||
Released under the MIT License, Copyright (c) 2006-2011 Kirill
|
Released under the MIT License, Copyright (c) 2006-2011 Kirill
|
||||||
Simonov
|
Simonov
|
||||||
|
|
||||||
bubble-table (https://github.com/Evertras/bubble-table)
|
|
||||||
Released under the MIT License, Copyright (c) 2022 Brandon Fulljames
|
|
||||||
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
Thomas von Dein tom AT vondein DOT org
|
Thomas von Dein tom AT vondein DOT org
|
||||||
|
|
||||||
@@ -446,16 +410,15 @@ Usage:
|
|||||||
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, --numbering Enable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-H, --no-headers Disable headers display
|
-H, --no-headers Disable headers display
|
||||||
-s, --separator string Custom field separator
|
-s, --separator string Custom field separator
|
||||||
-k, --sort-by int|name Sort by column (default: 1)
|
-k, --sort-by int|name Sort by column (default: 1)
|
||||||
-z, --fuzzy Use fuzzy search [experimental]
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
-F, --filter field[!]=reg Filter given field with regex, can be used multiple times
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
-I, --interactive Interactively filter and select rows
|
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
@@ -466,8 +429,6 @@ Output Flags (mutually exclusive):
|
|||||||
-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
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
-y, --yank-columns Yank specified columns (separated by ,) to clipboard,
|
|
||||||
space separated
|
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
60
go.mod
60
go.mod
@@ -1,60 +1,34 @@
|
|||||||
module github.com/tlinden/tablizer
|
module github.com/tlinden/tablizer
|
||||||
|
|
||||||
go 1.23.0
|
go 1.22
|
||||||
|
|
||||||
toolchain go1.23.5
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/alecthomas/repr v0.5.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/charmbracelet/bubbles v0.21.0
|
github.com/gookit/color v1.5.4
|
||||||
github.com/charmbracelet/bubbletea v1.3.6
|
github.com/hashicorp/hcl/v2 v2.23.0
|
||||||
github.com/charmbracelet/lipgloss v1.1.0
|
|
||||||
github.com/evertras/bubble-table v0.19.0
|
|
||||||
github.com/gookit/color v1.6.0
|
|
||||||
github.com/hashicorp/hcl/v2 v2.24.0
|
|
||||||
github.com/lithammer/fuzzysearch v1.1.8
|
github.com/lithammer/fuzzysearch v1.1.8
|
||||||
github.com/olekukonko/tablewriter v1.0.9
|
github.com/olekukonko/tablewriter v0.0.5
|
||||||
github.com/rogpeppe/go-internal v1.14.1
|
github.com/rogpeppe/go-internal v1.13.1
|
||||||
github.com/spf13/cobra v1.9.1
|
github.com/spf13/cobra v1.8.1
|
||||||
github.com/tiagomelo/go-clipboard v0.1.2
|
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/agext/levenshtein v1.2.3 // indirect
|
github.com/agext/levenshtein v1.2.3 // indirect
|
||||||
|
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
|
||||||
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
|
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
|
||||||
github.com/atotto/clipboard v0.1.4 // indirect
|
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
|
||||||
github.com/charmbracelet/colorprofile v0.3.1 // indirect
|
|
||||||
github.com/charmbracelet/x/ansi v0.9.3 // indirect
|
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
|
|
||||||
github.com/charmbracelet/x/term v0.2.1 // indirect
|
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
|
||||||
github.com/fatih/color v1.18.0 // indirect
|
|
||||||
github.com/google/go-cmp v0.6.0 // indirect
|
github.com/google/go-cmp v0.6.0 // indirect
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
|
||||||
github.com/mattn/go-colorable v0.1.14 // indirect
|
|
||||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
|
||||||
github.com/mattn/go-localereader v0.0.1 // indirect
|
|
||||||
github.com/mattn/go-runewidth v0.0.16 // indirect
|
github.com/mattn/go-runewidth v0.0.16 // indirect
|
||||||
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
|
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
|
||||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
github.com/rivo/uniseg v0.2.0 // indirect
|
||||||
github.com/muesli/cancelreader v0.2.2 // indirect
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
github.com/muesli/reflow v0.3.0 // indirect
|
|
||||||
github.com/muesli/termenv v0.16.0 // indirect
|
|
||||||
github.com/olekukonko/errors v1.1.0 // indirect
|
|
||||||
github.com/olekukonko/ll v0.0.9 // indirect
|
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
|
||||||
github.com/spf13/pflag v1.0.6 // indirect
|
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
github.com/zclconf/go-cty v1.16.3 // indirect
|
github.com/zclconf/go-cty v1.13.3 // indirect
|
||||||
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
|
golang.org/x/mod v0.18.0 // indirect
|
||||||
golang.org/x/mod v0.21.0 // indirect
|
golang.org/x/sync v0.7.0 // indirect
|
||||||
golang.org/x/sync v0.15.0 // indirect
|
golang.org/x/sys v0.21.0 // indirect
|
||||||
golang.org/x/sys v0.33.0 // indirect
|
golang.org/x/text v0.11.0 // indirect
|
||||||
golang.org/x/text v0.25.0 // indirect
|
golang.org/x/tools v0.22.0 // indirect
|
||||||
golang.org/x/tools v0.26.0 // indirect
|
|
||||||
)
|
)
|
||||||
|
|||||||
121
go.sum
121
go.sum
@@ -1,118 +1,69 @@
|
|||||||
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
|
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
|
||||||
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
|
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
|
||||||
github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
|
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
|
||||||
github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
|
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 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
|
||||||
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
|
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/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
|
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||||
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
|
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
|
||||||
github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
|
|
||||||
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
|
|
||||||
github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
|
|
||||||
github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
|
|
||||||
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
|
|
||||||
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
|
|
||||||
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
|
|
||||||
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
|
||||||
github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
|
|
||||||
github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
|
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
|
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
|
|
||||||
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
|
|
||||||
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
|
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
|
||||||
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/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
|
|
||||||
github.com/evertras/bubble-table v0.19.0 h1:+JlXRUjNuBN1JI7XU1PapmW1wglbcqZUKkiPnVKPgrc=
|
|
||||||
github.com/evertras/bubble-table v0.19.0/go.mod h1:ifHujS1YxwnYSOgcR2+m3GnJ84f7CVU/4kUOxUCjEbQ=
|
|
||||||
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
|
|
||||||
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
|
|
||||||
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
|
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
|
||||||
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
|
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0=
|
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
|
||||||
github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E=
|
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
|
||||||
github.com/gookit/color v1.6.0 h1:JjJXBTk1ETNyqyilJhkTXJYYigHG24TM9Xa2M1xAhRA=
|
github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
|
||||||
github.com/gookit/color v1.6.0/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs=
|
github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
|
||||||
github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
|
|
||||||
github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||||
github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
|
github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
|
||||||
github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
|
github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
|
||||||
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
|
|
||||||
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
|
|
||||||
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
|
|
||||||
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.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
|
|
||||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||||
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
|
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
|
||||||
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
|
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
|
||||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
|
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
|
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||||
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
|
|
||||||
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
|
|
||||||
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
|
|
||||||
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
|
|
||||||
github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
|
|
||||||
github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
|
|
||||||
github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
|
|
||||||
github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
|
|
||||||
github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
|
|
||||||
github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
|
|
||||||
github.com/olekukonko/tablewriter v1.0.9 h1:XGwRsYLC2bY7bNd93Dk51bcPZksWZmLYuaTHR0FqfL8=
|
|
||||||
github.com/olekukonko/tablewriter v1.0.9/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
|
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
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/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/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||||
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
|
||||||
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
|
||||||
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.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
|
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
|
||||||
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
|
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
|
||||||
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
|
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||||
github.com/spf13/pflag v1.0.6/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/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.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
github.com/tiagomelo/go-clipboard v0.1.2 h1:Ph2icR0vZRIj3v5ExvsGweBwsbbDUTlS6HoF40MkQD8=
|
|
||||||
github.com/tiagomelo/go-clipboard v0.1.2/go.mod h1:kXtjJBIMimZaGbxmcKZ8+JqK+acSNf5tAJiChlZBOr8=
|
|
||||||
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=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=
|
github.com/zclconf/go-cty v1.13.3 h1:m+b9q3YDbg6Bec5rr+KGy1MzEVzY/jC2X+YX4yqKtHI=
|
||||||
github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
|
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=
|
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
|
||||||
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
|
github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
|
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
|
||||||
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
|
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
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.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
|
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
|
||||||
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
|
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-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-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.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
@@ -120,18 +71,16 @@ 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-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.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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
|
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||||
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
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-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-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/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-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.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.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
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.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/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
@@ -140,14 +89,14 @@ 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.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.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.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
|
||||||
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
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-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.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.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.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
|
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
|
||||||
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
|
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=
|
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=
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022-2025 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
|
||||||
@@ -86,19 +86,15 @@ func FilterByFields(conf cfg.Config, data *Tabdata) (*Tabdata, bool, error) {
|
|||||||
keep := true
|
keep := true
|
||||||
|
|
||||||
for idx, header := range data.headers {
|
for idx, header := range data.headers {
|
||||||
lcheader := strings.ToLower(header)
|
if !Exists(conf.Filters, strings.ToLower(header)) {
|
||||||
if !Exists(conf.Filters, lcheader) {
|
|
||||||
// do not filter by unspecified field
|
// do not filter by unspecified field
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
match := conf.Filters[lcheader].Regex.MatchString(row[idx])
|
if !conf.Filters[strings.ToLower(header)].MatchString(row[idx]) {
|
||||||
if conf.Filters[lcheader].Negate {
|
// there IS a filter, but it doesn't match
|
||||||
match = !match
|
|
||||||
}
|
|
||||||
|
|
||||||
if !match {
|
|
||||||
keep = false
|
keep = false
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2024-2025 Thomas von Dein
|
Copyright © 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
|
||||||
@@ -98,20 +98,6 @@ func TestFilterByFields(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
name: "one-field-negative",
|
|
||||||
filter: []string{"one!=asd"},
|
|
||||||
expect: Tabdata{
|
|
||||||
headers: []string{
|
|
||||||
"ONE", "TWO", "THREE",
|
|
||||||
},
|
|
||||||
entries: [][]string{
|
|
||||||
{"19191", "EDD 1", "x"},
|
|
||||||
{"8d8", "AN 1", "y"},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
{
|
||||||
name: "one-field-inverted",
|
name: "one-field-inverted",
|
||||||
filter: []string{"one=19"},
|
filter: []string{"one=19"},
|
||||||
|
|||||||
@@ -77,14 +77,6 @@ func PrepareColumns(conf *cfg.Config, data *Tabdata) error {
|
|||||||
|
|
||||||
conf.UseColumns = usecolumns
|
conf.UseColumns = usecolumns
|
||||||
|
|
||||||
// -y columns
|
|
||||||
useyankcolumns, err := PrepareColumnVars(conf.YankColumns, data)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
conf.UseYankColumns = useyankcolumns
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,13 +200,13 @@ func numberizeAndReduceHeaders(conf cfg.Config, data *Tabdata) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if conf.Numbering {
|
if conf.NoNumbering {
|
||||||
|
numberedHeaders = append(numberedHeaders, head)
|
||||||
|
headlen = len(head)
|
||||||
|
} else {
|
||||||
numhead := fmt.Sprintf("%s(%d)", head, idx+1)
|
numhead := fmt.Sprintf("%s(%d)", head, idx+1)
|
||||||
headlen = len(numhead)
|
headlen = len(numhead)
|
||||||
numberedHeaders = append(numberedHeaders, numhead)
|
numberedHeaders = append(numberedHeaders, numhead)
|
||||||
} else {
|
|
||||||
numberedHeaders = append(numberedHeaders, head)
|
|
||||||
headlen = len(head)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if headlen > maxwidth {
|
if headlen > maxwidth {
|
||||||
@@ -254,6 +246,17 @@ func reduceColumns(conf cfg.Config, data *Tabdata) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME: remove this when we only use Tablewriter and strip in ParseFile()!
|
||||||
|
func trimRow(row []string) []string {
|
||||||
|
var fixedrow = make([]string, len(row))
|
||||||
|
|
||||||
|
for idx, cell := range row {
|
||||||
|
fixedrow[idx] = strings.TrimSpace(cell)
|
||||||
|
}
|
||||||
|
|
||||||
|
return fixedrow
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME: refactor this beast!
|
// FIXME: refactor this beast!
|
||||||
func colorizeData(conf cfg.Config, output string) string {
|
func colorizeData(conf cfg.Config, output string) string {
|
||||||
switch {
|
switch {
|
||||||
|
|||||||
@@ -216,21 +216,21 @@ func TestNumberizeHeaders(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var tests = []struct {
|
var tests = []struct {
|
||||||
expect []string
|
expect []string
|
||||||
columns []int
|
columns []int
|
||||||
numberize bool
|
nonum bool
|
||||||
}{
|
}{
|
||||||
{[]string{"ONE(1)", "TWO(2)", "THREE(3)"}, []int{1, 2, 3}, true},
|
{[]string{"ONE(1)", "TWO(2)", "THREE(3)"}, []int{1, 2, 3}, false},
|
||||||
{[]string{"ONE(1)", "TWO(2)"}, []int{1, 2}, true},
|
{[]string{"ONE(1)", "TWO(2)"}, []int{1, 2}, false},
|
||||||
{[]string{"ONE", "TWO"}, []int{1, 2}, false},
|
{[]string{"ONE", "TWO"}, []int{1, 2}, true},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, testdata := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("numberize-headers-columns-%+v-nonum-%t",
|
testname := fmt.Sprintf("numberize-headers-columns-%+v-nonum-%t",
|
||||||
testdata.columns, testdata.numberize)
|
testdata.columns, testdata.nonum)
|
||||||
|
|
||||||
t.Run(testname, func(t *testing.T) {
|
t.Run(testname, func(t *testing.T) {
|
||||||
conf := cfg.Config{Columns: "x", UseColumns: testdata.columns, Numbering: testdata.numberize}
|
conf := cfg.Config{Columns: "x", UseColumns: testdata.columns, NoNumbering: testdata.nonum}
|
||||||
usedata := data
|
usedata := data
|
||||||
numberizeAndReduceHeaders(conf, &usedata)
|
numberizeAndReduceHeaders(conf, &usedata)
|
||||||
if !reflect.DeepEqual(usedata.headers, testdata.expect) {
|
if !reflect.DeepEqual(usedata.headers, testdata.expect) {
|
||||||
|
|||||||
@@ -58,15 +58,6 @@ func ProcessFiles(conf *cfg.Config, args []string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if conf.Interactive {
|
|
||||||
newdata, err := tableEditor(conf, &data)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
data = *newdata
|
|
||||||
}
|
|
||||||
|
|
||||||
printData(os.Stdout, *conf, &data)
|
printData(os.Stdout, *conf, &data)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
120
lib/pager.go
120
lib/pager.go
@@ -1,120 +0,0 @@
|
|||||||
package lib
|
|
||||||
|
|
||||||
// pager setup using bubbletea
|
|
||||||
// file shamlelessly copied from:
|
|
||||||
// https://github.com/charmbracelet/bubbletea/tree/main/examples/pager
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/charmbracelet/bubbles/viewport"
|
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
|
||||||
"github.com/charmbracelet/lipgloss"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
titleStyle = func() lipgloss.Style {
|
|
||||||
b := lipgloss.RoundedBorder()
|
|
||||||
b.Right = "├"
|
|
||||||
return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
|
|
||||||
}()
|
|
||||||
|
|
||||||
infoStyle = func() lipgloss.Style {
|
|
||||||
b := lipgloss.RoundedBorder()
|
|
||||||
b.Left = "┤"
|
|
||||||
return titleStyle.BorderStyle(b)
|
|
||||||
}()
|
|
||||||
)
|
|
||||||
|
|
||||||
type Doc struct {
|
|
||||||
content string
|
|
||||||
title string
|
|
||||||
ready bool
|
|
||||||
viewport viewport.Model
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Doc) Init() tea.Cmd {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Doc) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|
||||||
var (
|
|
||||||
cmd tea.Cmd
|
|
||||||
cmds []tea.Cmd
|
|
||||||
)
|
|
||||||
|
|
||||||
switch msg := msg.(type) {
|
|
||||||
case tea.KeyMsg:
|
|
||||||
if k := msg.String(); k == "ctrl+c" || k == "q" || k == "esc" {
|
|
||||||
return m, tea.Quit
|
|
||||||
}
|
|
||||||
|
|
||||||
case tea.WindowSizeMsg:
|
|
||||||
headerHeight := lipgloss.Height(m.headerView())
|
|
||||||
footerHeight := lipgloss.Height(m.footerView())
|
|
||||||
verticalMarginHeight := headerHeight + footerHeight
|
|
||||||
|
|
||||||
if !m.ready {
|
|
||||||
// Since this program is using the full size of the viewport we
|
|
||||||
// need to wait until we've received the window dimensions before
|
|
||||||
// we can initialize the viewport. The initial dimensions come in
|
|
||||||
// quickly, though asynchronously, which is why we wait for them
|
|
||||||
// here.
|
|
||||||
m.viewport = viewport.New(msg.Width, msg.Height-verticalMarginHeight)
|
|
||||||
m.viewport.YPosition = headerHeight
|
|
||||||
m.viewport.SetContent(m.content)
|
|
||||||
m.ready = true
|
|
||||||
} else {
|
|
||||||
m.viewport.Width = msg.Width
|
|
||||||
m.viewport.Height = msg.Height - verticalMarginHeight
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle keyboard and mouse events in the viewport
|
|
||||||
m.viewport, cmd = m.viewport.Update(msg)
|
|
||||||
cmds = append(cmds, cmd)
|
|
||||||
|
|
||||||
return m, tea.Batch(cmds...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Doc) View() string {
|
|
||||||
if !m.ready {
|
|
||||||
return "\n Initializing..."
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Doc) headerView() string {
|
|
||||||
// title := titleStyle.Render("RPN Help Overview")
|
|
||||||
title := titleStyle.Render(m.title)
|
|
||||||
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
|
|
||||||
return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m Doc) footerView() string {
|
|
||||||
info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
|
|
||||||
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
|
|
||||||
return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
|
|
||||||
}
|
|
||||||
|
|
||||||
func max(a, b int) int {
|
|
||||||
if a > b {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func Pager(title, message string) {
|
|
||||||
p := tea.NewProgram(
|
|
||||||
Doc{content: message, title: title},
|
|
||||||
tea.WithAltScreen(), // use the full size of the terminal in its "alternate screen buffer"
|
|
||||||
tea.WithMouseCellMotion(), // turn on mouse support so we can track the mouse wheel
|
|
||||||
)
|
|
||||||
|
|
||||||
if _, err := p.Run(); err != nil {
|
|
||||||
fmt.Println("could not run pager:", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
191
lib/printer.go
191
lib/printer.go
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright © 2022-2025 Thomas von Dein
|
Copyright © 2022 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
|
||||||
@@ -22,13 +22,12 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/gookit/color"
|
"github.com/gookit/color"
|
||||||
"github.com/olekukonko/tablewriter"
|
"github.com/olekukonko/tablewriter"
|
||||||
"github.com/olekukonko/tablewriter/renderer"
|
|
||||||
"github.com/olekukonko/tablewriter/tw"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
"github.com/tlinden/tablizer/cfg"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
@@ -39,9 +38,6 @@ func printData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
|||||||
// by, independently if it's being used for display or not.
|
// by, independently if it's being used for display or not.
|
||||||
sortTable(conf, data)
|
sortTable(conf, data)
|
||||||
|
|
||||||
// put one or more columns into clipboard
|
|
||||||
yankColumns(conf, data)
|
|
||||||
|
|
||||||
// add numbers to headers and remove those we're not interested in
|
// add numbers to headers and remove those we're not interested in
|
||||||
numberizeAndReduceHeaders(conf, data)
|
numberizeAndReduceHeaders(conf, data)
|
||||||
|
|
||||||
@@ -77,58 +73,36 @@ Emacs org-mode compatible table (also orgtbl-mode)
|
|||||||
*/
|
*/
|
||||||
func printOrgmodeData(writer io.Writer, conf 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.NewTable(tableString,
|
|
||||||
tablewriter.WithRenderer(
|
|
||||||
renderer.NewBlueprint(
|
|
||||||
tw.Rendition{
|
|
||||||
Borders: tw.Border{
|
|
||||||
Left: tw.On,
|
|
||||||
Right: tw.On,
|
|
||||||
Top: tw.On,
|
|
||||||
Bottom: tw.On,
|
|
||||||
},
|
|
||||||
Settings: tw.Settings{
|
|
||||||
Separators: tw.Separators{
|
|
||||||
ShowHeader: tw.On,
|
|
||||||
ShowFooter: tw.Off,
|
|
||||||
BetweenRows: tw.Off,
|
|
||||||
BetweenColumns: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Symbols: tw.NewSymbols(tw.StyleASCII),
|
|
||||||
})),
|
|
||||||
|
|
||||||
tablewriter.WithConfig(
|
|
||||||
tablewriter.Config{
|
|
||||||
Header: tw.CellConfig{
|
|
||||||
Formatting: tw.CellFormatting{
|
|
||||||
Alignment: tw.AlignLeft,
|
|
||||||
AutoFormat: tw.Off,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Row: tw.CellConfig{
|
|
||||||
Formatting: tw.CellFormatting{
|
|
||||||
Alignment: tw.AlignLeft,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
if !conf.NoHeaders {
|
if !conf.NoHeaders {
|
||||||
table.Header(data.headers)
|
table.SetHeader(data.headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := table.Bulk(data.entries); err != nil {
|
for _, row := range data.entries {
|
||||||
log.Fatalf("Failed to add data to table renderer: %s", err)
|
table.Append(trimRow(row))
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := table.Render(); err != nil {
|
table.Render()
|
||||||
log.Fatalf("Failed to render table: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
/* fix output for org-mode (orgtbl)
|
||||||
|
tableWriter output:
|
||||||
|
+------+------+
|
||||||
|
| cell | cell |
|
||||||
|
+------+------+
|
||||||
|
|
||||||
|
Needed for org-mode compatibility:
|
||||||
|
|------+------|
|
||||||
|
| cell | cell |
|
||||||
|
|------+------|
|
||||||
|
*/
|
||||||
|
leftR := regexp.MustCompile(`(?m)^\\+`)
|
||||||
|
rightR := regexp.MustCompile(`\\+(?m)$`)
|
||||||
|
|
||||||
|
output(writer, color.Sprint(
|
||||||
|
colorizeData(conf,
|
||||||
|
rightR.ReplaceAllString(
|
||||||
|
leftR.ReplaceAllString(tableString.String(), "|"), "|"))))
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -136,57 +110,20 @@ Markdown table
|
|||||||
*/
|
*/
|
||||||
func printMarkdownData(writer io.Writer, conf 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.NewTable(tableString,
|
|
||||||
tablewriter.WithRenderer(
|
|
||||||
renderer.NewBlueprint(
|
|
||||||
tw.Rendition{
|
|
||||||
Borders: tw.Border{
|
|
||||||
Left: tw.On,
|
|
||||||
Right: tw.On,
|
|
||||||
Top: tw.Off,
|
|
||||||
Bottom: tw.Off,
|
|
||||||
},
|
|
||||||
Settings: tw.Settings{
|
|
||||||
Separators: tw.Separators{
|
|
||||||
ShowHeader: tw.On,
|
|
||||||
ShowFooter: tw.Off,
|
|
||||||
BetweenRows: tw.Off,
|
|
||||||
BetweenColumns: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Symbols: tw.NewSymbols(tw.StyleMarkdown),
|
|
||||||
})),
|
|
||||||
|
|
||||||
tablewriter.WithConfig(
|
|
||||||
tablewriter.Config{
|
|
||||||
Header: tw.CellConfig{
|
|
||||||
Formatting: tw.CellFormatting{
|
|
||||||
Alignment: tw.AlignLeft,
|
|
||||||
AutoFormat: tw.Off,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Row: tw.CellConfig{
|
|
||||||
Formatting: tw.CellFormatting{
|
|
||||||
Alignment: tw.AlignLeft,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
if !conf.NoHeaders {
|
if !conf.NoHeaders {
|
||||||
table.Header(data.headers)
|
table.SetHeader(data.headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := table.Bulk(data.entries); err != nil {
|
for _, row := range data.entries {
|
||||||
log.Fatalf("Failed to add data to table renderer: %s", err)
|
table.Append(trimRow(row))
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := table.Render(); err != nil {
|
table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
|
||||||
log.Fatalf("Failed to render table: %s", err)
|
table.SetCenterSeparator("|")
|
||||||
}
|
|
||||||
|
|
||||||
|
table.Render()
|
||||||
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,55 +132,33 @@ Simple ASCII table without any borders etc, just like the input we expect
|
|||||||
*/
|
*/
|
||||||
func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
|
||||||
tableString := &strings.Builder{}
|
tableString := &strings.Builder{}
|
||||||
|
table := tablewriter.NewWriter(tableString)
|
||||||
styleTSV := tw.NewSymbolCustom("space").WithColumn("\t")
|
|
||||||
|
|
||||||
table := tablewriter.NewTable(tableString,
|
|
||||||
tablewriter.WithRenderer(
|
|
||||||
renderer.NewBlueprint(tw.Rendition{
|
|
||||||
Borders: tw.BorderNone,
|
|
||||||
Symbols: styleTSV,
|
|
||||||
Settings: tw.Settings{
|
|
||||||
Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.On},
|
|
||||||
Lines: tw.Lines{ShowFooterLine: tw.Off, ShowHeaderLine: tw.Off},
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
tablewriter.WithConfig(tablewriter.Config{
|
|
||||||
Header: tw.CellConfig{
|
|
||||||
Formatting: tw.CellFormatting{
|
|
||||||
AutoFormat: tw.Off,
|
|
||||||
},
|
|
||||||
Padding: tw.CellPadding{
|
|
||||||
Global: tw.Padding{Left: "", Right: ""},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Row: tw.CellConfig{
|
|
||||||
Formatting: tw.CellFormatting{
|
|
||||||
AutoWrap: tw.WrapNone,
|
|
||||||
Alignment: tw.AlignLeft,
|
|
||||||
},
|
|
||||||
Padding: tw.CellPadding{
|
|
||||||
Global: tw.Padding{Left: "", Right: ""},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
Debug: true,
|
|
||||||
}),
|
|
||||||
tablewriter.WithPadding(tw.PaddingNone),
|
|
||||||
)
|
|
||||||
|
|
||||||
if !conf.NoHeaders {
|
if !conf.NoHeaders {
|
||||||
table.Header(data.headers)
|
table.SetHeader(data.headers)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := table.Bulk(data.entries); err != nil {
|
table.AppendBulk(data.entries)
|
||||||
log.Fatalf("Failed to add data to table renderer: %s", err)
|
|
||||||
}
|
table.SetAutoWrapText(false)
|
||||||
|
table.SetAutoFormatHeaders(true)
|
||||||
if err := table.Render(); err != nil {
|
table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
|
||||||
log.Fatalf("Failed to render table: %s", err)
|
table.SetAlignment(tablewriter.ALIGN_LEFT)
|
||||||
|
table.SetCenterSeparator("")
|
||||||
|
table.SetColumnSeparator("")
|
||||||
|
table.SetRowSeparator("")
|
||||||
|
table.SetHeaderLine(false)
|
||||||
|
table.SetBorder(false)
|
||||||
|
table.SetNoWhiteSpace(true)
|
||||||
|
|
||||||
|
if !conf.UseHighlight {
|
||||||
|
// the tabs destroy the highlighting
|
||||||
|
table.SetTablePadding("\t") // pad with tabs
|
||||||
|
} else {
|
||||||
|
table.SetTablePadding(" ")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
table.Render()
|
||||||
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
output(writer, color.Sprint(colorizeData(conf, tableString.String())))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ var tests = []struct {
|
|||||||
sortby string // empty == default
|
sortby string // empty == default
|
||||||
column int // sort by this column (numbers start by 1)
|
column int // sort by this column (numbers start by 1)
|
||||||
desc bool // sort in descending order, default == ascending
|
desc bool // sort in descending order, default == ascending
|
||||||
numberize bool // add header numbering
|
nonum bool // hide numbering
|
||||||
mode int // shell, orgtbl, etc. empty == default: ascii
|
mode int // shell, orgtbl, etc. empty == default: ascii
|
||||||
usecol []int // columns to display, empty == display all
|
usecol []int // columns to display, empty == display all
|
||||||
usecolstr string // for testname, must match usecol
|
usecolstr string // for testname, must match usecol
|
||||||
@@ -73,9 +73,8 @@ var tests = []struct {
|
|||||||
}{
|
}{
|
||||||
// --------------------- Default settings mode tests ``
|
// --------------------- Default settings mode tests ``
|
||||||
{
|
{
|
||||||
mode: cfg.ASCII,
|
mode: cfg.ASCII,
|
||||||
numberize: true,
|
name: "default",
|
||||||
name: "default",
|
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
||||||
beta 1d10h5m1s 33 3/1/2014
|
beta 1d10h5m1s 33 3/1/2014
|
||||||
@@ -83,9 +82,8 @@ alpha 4h35m 170 2013-Feb-03
|
|||||||
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`,
|
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
mode: cfg.CSV,
|
mode: cfg.CSV,
|
||||||
numberize: false,
|
name: "csv",
|
||||||
name: "csv",
|
|
||||||
expect: `
|
expect: `
|
||||||
NAME,DURATION,COUNT,WHEN
|
NAME,DURATION,COUNT,WHEN
|
||||||
beta,1d10h5m1s,33,3/1/2014
|
beta,1d10h5m1s,33,3/1/2014
|
||||||
@@ -93,42 +91,40 @@ alpha,4h35m,170,2013-Feb-03
|
|||||||
ceta,33d12h,9,06/Jan/2008 15:04:05 -0700`,
|
ceta,33d12h,9,06/Jan/2008 15:04:05 -0700`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "orgtbl",
|
name: "default",
|
||||||
numberize: true,
|
mode: cfg.Orgtbl,
|
||||||
mode: cfg.Orgtbl,
|
|
||||||
expect: `
|
expect: `
|
||||||
+---------+-------------+----------+----------------------------+
|
+---------+-------------+----------+----------------------------+
|
||||||
| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4) |
|
| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4) |
|
||||||
+---------+-------------+----------+----------------------------+
|
+---------+-------------+----------+----------------------------+
|
||||||
| beta | 1d10h5m1s | 33 | 3/1/2014 |
|
| beta | 1d10h5m1s | 33 | 3/1/2014 |
|
||||||
| alpha | 4h35m | 170 | 2013-Feb-03 |
|
| alpha | 4h35m | 170 | 2013-Feb-03 |
|
||||||
| ceta | 33d12h | 9 | 06/Jan/2008 15:04:05 -0700 |
|
| ceta | 33d12h | 9 | 06/Jan/2008 15:04:05 -0700 |
|
||||||
+---------+-------------+----------+----------------------------+`,
|
+---------+-------------+----------+----------------------------+`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "markdown",
|
name: "default",
|
||||||
mode: cfg.Markdown,
|
mode: cfg.Markdown,
|
||||||
numberize: true,
|
|
||||||
expect: `
|
expect: `
|
||||||
| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4) |
|
| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4) |
|
||||||
|---------|-------------|----------|----------------------------|
|
|---------|-------------|----------|----------------------------|
|
||||||
| beta | 1d10h5m1s | 33 | 3/1/2014 |
|
| beta | 1d10h5m1s | 33 | 3/1/2014 |
|
||||||
| alpha | 4h35m | 170 | 2013-Feb-03 |
|
| alpha | 4h35m | 170 | 2013-Feb-03 |
|
||||||
| ceta | 33d12h | 9 | 06/Jan/2008 15:04:05 -0700 |`,
|
| ceta | 33d12h | 9 | 06/Jan/2008 15:04:05 -0700 |`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "shell",
|
name: "default",
|
||||||
mode: cfg.Shell,
|
mode: cfg.Shell,
|
||||||
numberize: false,
|
nonum: true,
|
||||||
expect: `
|
expect: `
|
||||||
NAME="beta" DURATION="1d10h5m1s" COUNT="33" WHEN="3/1/2014"
|
NAME="beta" DURATION="1d10h5m1s" COUNT="33" WHEN="3/1/2014"
|
||||||
NAME="alpha" DURATION="4h35m" COUNT="170" WHEN="2013-Feb-03"
|
NAME="alpha" DURATION="4h35m" COUNT="170" WHEN="2013-Feb-03"
|
||||||
NAME="ceta" DURATION="33d12h" COUNT="9" WHEN="06/Jan/2008 15:04:05 -0700"`,
|
NAME="ceta" DURATION="33d12h" COUNT="9" WHEN="06/Jan/2008 15:04:05 -0700"`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "yaml",
|
name: "default",
|
||||||
mode: cfg.Yaml,
|
mode: cfg.Yaml,
|
||||||
numberize: false,
|
nonum: true,
|
||||||
expect: `
|
expect: `
|
||||||
entries:
|
entries:
|
||||||
- count: 33
|
- count: 33
|
||||||
@@ -145,9 +141,8 @@ entries:
|
|||||||
when: "06/Jan/2008 15:04:05 -0700"`,
|
when: "06/Jan/2008 15:04:05 -0700"`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "extended",
|
name: "default",
|
||||||
mode: cfg.Extended,
|
mode: cfg.Extended,
|
||||||
numberize: true,
|
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1): beta
|
NAME(1): beta
|
||||||
DURATION(2): 1d10h5m1s
|
DURATION(2): 1d10h5m1s
|
||||||
@@ -167,11 +162,10 @@ DURATION(2): 33d12h
|
|||||||
|
|
||||||
//------------------------ SORT TESTS
|
//------------------------ SORT TESTS
|
||||||
{
|
{
|
||||||
name: "sortbycolumn3",
|
name: "sortbycolumn3",
|
||||||
column: 3,
|
column: 3,
|
||||||
sortby: "numeric",
|
sortby: "numeric",
|
||||||
numberize: true,
|
desc: false,
|
||||||
desc: false,
|
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
||||||
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700
|
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700
|
||||||
@@ -179,11 +173,10 @@ beta 1d10h5m1s 33 3/1/2014
|
|||||||
alpha 4h35m 170 2013-Feb-03`,
|
alpha 4h35m 170 2013-Feb-03`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "sortbycolumn4",
|
name: "sortbycolumn4",
|
||||||
column: 4,
|
column: 4,
|
||||||
sortby: "time",
|
sortby: "time",
|
||||||
desc: false,
|
desc: false,
|
||||||
numberize: true,
|
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
||||||
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700
|
ceta 33d12h 9 06/Jan/2008 15:04:05 -0700
|
||||||
@@ -191,11 +184,10 @@ alpha 4h35m 170 2013-Feb-03
|
|||||||
beta 1d10h5m1s 33 3/1/2014`,
|
beta 1d10h5m1s 33 3/1/2014`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "sortbycolumn2",
|
name: "sortbycolumn2",
|
||||||
column: 2,
|
column: 2,
|
||||||
sortby: "duration",
|
sortby: "duration",
|
||||||
numberize: true,
|
desc: false,
|
||||||
desc: false,
|
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
NAME(1) DURATION(2) COUNT(3) WHEN(4)
|
||||||
alpha 4h35m 170 2013-Feb-03
|
alpha 4h35m 170 2013-Feb-03
|
||||||
@@ -207,7 +199,6 @@ ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`,
|
|||||||
{
|
{
|
||||||
name: "usecolumns",
|
name: "usecolumns",
|
||||||
usecol: []int{1, 4},
|
usecol: []int{1, 4},
|
||||||
numberize: true,
|
|
||||||
usecolstr: "1,4",
|
usecolstr: "1,4",
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) WHEN(4)
|
NAME(1) WHEN(4)
|
||||||
@@ -218,7 +209,6 @@ ceta 06/Jan/2008 15:04:05 -0700`,
|
|||||||
{
|
{
|
||||||
name: "usecolumns",
|
name: "usecolumns",
|
||||||
usecol: []int{2},
|
usecol: []int{2},
|
||||||
numberize: true,
|
|
||||||
usecolstr: "2",
|
usecolstr: "2",
|
||||||
expect: `
|
expect: `
|
||||||
DURATION(2)
|
DURATION(2)
|
||||||
@@ -229,7 +219,6 @@ DURATION(2)
|
|||||||
{
|
{
|
||||||
name: "usecolumns",
|
name: "usecolumns",
|
||||||
usecol: []int{3},
|
usecol: []int{3},
|
||||||
numberize: true,
|
|
||||||
usecolstr: "3",
|
usecolstr: "3",
|
||||||
expect: `
|
expect: `
|
||||||
COUNT(3)
|
COUNT(3)
|
||||||
@@ -241,7 +230,6 @@ COUNT(3)
|
|||||||
name: "usecolumns",
|
name: "usecolumns",
|
||||||
column: 0,
|
column: 0,
|
||||||
usecol: []int{1, 3},
|
usecol: []int{1, 3},
|
||||||
numberize: true,
|
|
||||||
usecolstr: "1,3",
|
usecolstr: "1,3",
|
||||||
expect: `
|
expect: `
|
||||||
NAME(1) COUNT(3)
|
NAME(1) COUNT(3)
|
||||||
@@ -252,7 +240,6 @@ ceta 9`,
|
|||||||
{
|
{
|
||||||
name: "usecolumns",
|
name: "usecolumns",
|
||||||
usecol: []int{2, 4},
|
usecol: []int{2, 4},
|
||||||
numberize: true,
|
|
||||||
usecolstr: "2,4",
|
usecolstr: "2,4",
|
||||||
expect: `
|
expect: `
|
||||||
DURATION(2) WHEN(4)
|
DURATION(2) WHEN(4)
|
||||||
@@ -264,10 +251,8 @@ DURATION(2) WHEN(4)
|
|||||||
|
|
||||||
func TestPrinter(t *testing.T) {
|
func TestPrinter(t *testing.T) {
|
||||||
for _, testdata := range tests {
|
for _, testdata := range tests {
|
||||||
testname := fmt.Sprintf("print-%s-%d-desc-%t-sortby-%s-mode-%d-usecolumns-%s-numberize-%t",
|
testname := fmt.Sprintf("print-%s-%d-desc-%t-sortby-%s-mode-%d-usecolumns-%s",
|
||||||
testdata.name, testdata.column, testdata.desc, testdata.sortby,
|
testdata.name, testdata.column, testdata.desc, testdata.sortby, testdata.mode, testdata.usecolstr)
|
||||||
testdata.mode, testdata.usecolstr, testdata.numberize)
|
|
||||||
|
|
||||||
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 writer bytes.Buffer
|
var writer bytes.Buffer
|
||||||
@@ -277,7 +262,7 @@ func TestPrinter(t *testing.T) {
|
|||||||
SortDescending: testdata.desc,
|
SortDescending: testdata.desc,
|
||||||
SortMode: testdata.sortby,
|
SortMode: testdata.sortby,
|
||||||
OutputMode: testdata.mode,
|
OutputMode: testdata.mode,
|
||||||
Numbering: testdata.numberize,
|
NoNumbering: testdata.nonum,
|
||||||
UseColumns: testdata.usecol,
|
UseColumns: testdata.usecol,
|
||||||
NoColor: true,
|
NoColor: true,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,516 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2025 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"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
|
||||||
"github.com/charmbracelet/lipgloss"
|
|
||||||
"github.com/evertras/bubble-table/table"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
)
|
|
||||||
|
|
||||||
// The context exists outside of the bubble loop, and is being used as
|
|
||||||
// pointer reciever. That way we can use it as our primary storage
|
|
||||||
// container.
|
|
||||||
type Context struct {
|
|
||||||
selectedColumn int
|
|
||||||
showHelp bool
|
|
||||||
descending bool
|
|
||||||
data *Tabdata
|
|
||||||
|
|
||||||
// Window dimensions
|
|
||||||
totalWidth int
|
|
||||||
totalHeight int
|
|
||||||
|
|
||||||
// Table dimensions
|
|
||||||
horizontalMargin int
|
|
||||||
verticalMargin int
|
|
||||||
}
|
|
||||||
|
|
||||||
// Execute tablizer sort function, feed it with fresh config, we do
|
|
||||||
// NOT use the existing runtime config, because sorting is
|
|
||||||
// configurable in the UI separately.
|
|
||||||
func (ctx *Context) Sort(mode string) {
|
|
||||||
conf := cfg.Config{
|
|
||||||
SortMode: mode,
|
|
||||||
SortDescending: ctx.descending,
|
|
||||||
UseSortByColumn: []int{ctx.selectedColumn + 1},
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.descending = !ctx.descending
|
|
||||||
|
|
||||||
sortTable(conf, ctx.data)
|
|
||||||
}
|
|
||||||
|
|
||||||
// The actual table model, holds the context pointer, a copy of the
|
|
||||||
// pre-processed data and some flags
|
|
||||||
type FilterTable struct {
|
|
||||||
Table table.Model
|
|
||||||
|
|
||||||
Rows int
|
|
||||||
|
|
||||||
quitting bool
|
|
||||||
unchanged bool
|
|
||||||
|
|
||||||
maxColumns int
|
|
||||||
headerIdx map[string]int
|
|
||||||
|
|
||||||
ctx *Context
|
|
||||||
|
|
||||||
columns []table.Column
|
|
||||||
}
|
|
||||||
|
|
||||||
type HelpLine []string
|
|
||||||
type HelpColumn []HelpLine
|
|
||||||
|
|
||||||
const (
|
|
||||||
// header+footer
|
|
||||||
ExtraRows = 5
|
|
||||||
|
|
||||||
HelpFooter = "?:help | "
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// we use our own custom border style
|
|
||||||
customBorder = table.Border{
|
|
||||||
Top: "─",
|
|
||||||
Left: "│",
|
|
||||||
Right: "│",
|
|
||||||
Bottom: "─",
|
|
||||||
|
|
||||||
TopRight: "╮",
|
|
||||||
TopLeft: "╭",
|
|
||||||
BottomRight: "╯",
|
|
||||||
BottomLeft: "╰",
|
|
||||||
|
|
||||||
TopJunction: "┬",
|
|
||||||
LeftJunction: "├",
|
|
||||||
RightJunction: "┤",
|
|
||||||
BottomJunction: "┴",
|
|
||||||
InnerJunction: "┼",
|
|
||||||
|
|
||||||
InnerDivider: "│",
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cells in selected columns will be highlighted
|
|
||||||
StyleSelected = lipgloss.NewStyle().
|
|
||||||
Background(lipgloss.Color("#696969")).
|
|
||||||
Foreground(lipgloss.Color("#ffffff")).
|
|
||||||
Align(lipgloss.Left)
|
|
||||||
|
|
||||||
StyleHeader = lipgloss.NewStyle().
|
|
||||||
Background(lipgloss.Color("#ffffff")).
|
|
||||||
Foreground(lipgloss.Color("#696969")).
|
|
||||||
Align(lipgloss.Left)
|
|
||||||
|
|
||||||
// help buffer styles
|
|
||||||
StyleKey = lipgloss.NewStyle().Bold(true)
|
|
||||||
StyleHelp = lipgloss.NewStyle().Foreground(lipgloss.Color("#ff4500"))
|
|
||||||
|
|
||||||
// the default style
|
|
||||||
NoStyle = lipgloss.NewStyle().Align(lipgloss.Left)
|
|
||||||
|
|
||||||
HelpData = []HelpColumn{
|
|
||||||
{
|
|
||||||
HelpLine{"up", "navigate up"},
|
|
||||||
HelpLine{"down", "navigate down"},
|
|
||||||
HelpLine{"tab", "navigate columns"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
HelpLine{"s", "sort alpha-numerically"},
|
|
||||||
HelpLine{"n", "sort numerically"},
|
|
||||||
HelpLine{"t", "sort by time"},
|
|
||||||
HelpLine{"d", "sort by duration"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
HelpLine{"spc", "[de]select a row"},
|
|
||||||
HelpLine{"a", "[de]select all visible rows"},
|
|
||||||
HelpLine{"f", "enter fuzzy filter"},
|
|
||||||
HelpLine{"esc", "finish filter input"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
HelpLine{"?", "show help buffer"},
|
|
||||||
HelpLine{"q", "commit and quit"},
|
|
||||||
HelpLine{"c-c", "discard and quit"},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
// rendered from Help above
|
|
||||||
Help = ""
|
|
||||||
|
|
||||||
// number of lines taken by help below, adjust accordingly!
|
|
||||||
HelpRows = 0
|
|
||||||
)
|
|
||||||
|
|
||||||
// generate a lipgloss styled help buffer consisting of various
|
|
||||||
// columns
|
|
||||||
func generateHelp() {
|
|
||||||
help := strings.Builder{}
|
|
||||||
helpcols := []string{}
|
|
||||||
maxrows := 0
|
|
||||||
|
|
||||||
for _, col := range HelpData {
|
|
||||||
help.Reset()
|
|
||||||
|
|
||||||
// determine max key width to avoid excess spaces between keys and help
|
|
||||||
keylen := 0
|
|
||||||
for _, line := range col {
|
|
||||||
if len(line[0]) > keylen {
|
|
||||||
keylen = len(line[0])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
keylenstr := fmt.Sprintf("%d", keylen)
|
|
||||||
|
|
||||||
for _, line := range col {
|
|
||||||
// 0: key, 1: help text
|
|
||||||
help.WriteString(StyleKey.Render(fmt.Sprintf("%-"+keylenstr+"s", line[0])))
|
|
||||||
help.WriteString(" " + StyleHelp.Render(line[1]) + " \n")
|
|
||||||
}
|
|
||||||
|
|
||||||
helpcols = append(helpcols, help.String())
|
|
||||||
|
|
||||||
if len(col) > maxrows {
|
|
||||||
maxrows = len(col)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
HelpRows = maxrows + 1
|
|
||||||
Help = "\n" + lipgloss.JoinHorizontal(lipgloss.Top, helpcols...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// initializes the table model
|
|
||||||
func NewModel(data *Tabdata, ctx *Context) FilterTable {
|
|
||||||
columns := make([]table.Column, len(data.headers))
|
|
||||||
lengths := make([]int, len(data.headers))
|
|
||||||
hidx := make(map[string]int, len(data.headers))
|
|
||||||
|
|
||||||
// give columns at least the header width
|
|
||||||
for idx, header := range data.headers {
|
|
||||||
lengths[idx] = len(header)
|
|
||||||
hidx[strings.ToLower(header)] = idx
|
|
||||||
}
|
|
||||||
|
|
||||||
// determine max width per column
|
|
||||||
for _, entry := range data.entries {
|
|
||||||
for i, cell := range entry {
|
|
||||||
if len(cell) > lengths[i] {
|
|
||||||
lengths[i] = len(cell)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// determine flexFactor with base 10, used by flexColumns
|
|
||||||
for i, len := range lengths {
|
|
||||||
if len <= 10 {
|
|
||||||
lengths[i] = 1
|
|
||||||
} else {
|
|
||||||
lengths[i] = len / 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// setup column data with flexColumns
|
|
||||||
for idx, header := range data.headers {
|
|
||||||
// FIXME: doesn't work
|
|
||||||
//columns[idx] = table.NewFlexColumn(strings.ToLower(header), StyleHeader.Render(header),
|
|
||||||
columns[idx] = table.NewFlexColumn(strings.ToLower(header), header,
|
|
||||||
lengths[idx]).WithFiltered(true).WithStyle(NoStyle)
|
|
||||||
}
|
|
||||||
|
|
||||||
// separate variable so we can share the row filling code
|
|
||||||
filtertbl := FilterTable{
|
|
||||||
maxColumns: len(data.headers),
|
|
||||||
Rows: len(data.entries),
|
|
||||||
headerIdx: hidx,
|
|
||||||
ctx: ctx,
|
|
||||||
columns: columns,
|
|
||||||
}
|
|
||||||
|
|
||||||
filtertbl.Table = table.New(columns)
|
|
||||||
filtertbl.fillRows()
|
|
||||||
|
|
||||||
// finally construct help buffer
|
|
||||||
generateHelp()
|
|
||||||
|
|
||||||
return filtertbl
|
|
||||||
}
|
|
||||||
|
|
||||||
// Applied to every cell on every change (TAB,up,down key, resize
|
|
||||||
// event etc)
|
|
||||||
func CellController(input table.StyledCellFuncInput, m FilterTable) lipgloss.Style {
|
|
||||||
if m.headerIdx[input.Column.Key()] == m.ctx.selectedColumn {
|
|
||||||
return StyleSelected
|
|
||||||
}
|
|
||||||
|
|
||||||
return NoStyle
|
|
||||||
}
|
|
||||||
|
|
||||||
// Selects or deselects ALL rows
|
|
||||||
func (m *FilterTable) ToggleAllSelected() {
|
|
||||||
rows := m.Table.GetVisibleRows()
|
|
||||||
selected := m.Table.SelectedRows()
|
|
||||||
|
|
||||||
if len(selected) > 0 {
|
|
||||||
for i, row := range selected {
|
|
||||||
rows[i] = row.Selected(false)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for i, row := range rows {
|
|
||||||
rows[i] = row.Selected(true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
m.Table.WithRows(rows)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ? pressed, display help message
|
|
||||||
func (m FilterTable) ToggleHelp() {
|
|
||||||
m.ctx.showHelp = !m.ctx.showHelp
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m FilterTable) Init() tea.Cmd {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Forward call to context sort
|
|
||||||
func (m *FilterTable) Sort(mode string) {
|
|
||||||
m.ctx.Sort(mode)
|
|
||||||
m.fillRows()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fills the table rows with our data. Called once on startup and
|
|
||||||
// repeatedly if the user changes the sort order in some way
|
|
||||||
func (m *FilterTable) fillRows() {
|
|
||||||
// required to be able to feed the model to the controller
|
|
||||||
controllerWrapper := func(input table.StyledCellFuncInput) lipgloss.Style {
|
|
||||||
return CellController(input, *m)
|
|
||||||
}
|
|
||||||
|
|
||||||
// fill the rows with style
|
|
||||||
rows := make([]table.Row, len(m.ctx.data.entries))
|
|
||||||
for idx, entry := range m.ctx.data.entries {
|
|
||||||
rowdata := make(table.RowData, len(entry))
|
|
||||||
|
|
||||||
for i, cell := range entry {
|
|
||||||
rowdata[strings.ToLower(m.ctx.data.headers[i])] =
|
|
||||||
table.NewStyledCellWithStyleFunc(cell+" ", controllerWrapper)
|
|
||||||
}
|
|
||||||
|
|
||||||
rows[idx] = table.NewRow(rowdata)
|
|
||||||
}
|
|
||||||
|
|
||||||
m.Table = m.Table.
|
|
||||||
WithRows(rows).
|
|
||||||
Filtered(true).
|
|
||||||
WithFuzzyFilter().
|
|
||||||
Focused(true).
|
|
||||||
SelectableRows(true).
|
|
||||||
WithSelectedText(" ", "✓").
|
|
||||||
WithFooterVisibility(true).
|
|
||||||
WithHeaderVisibility(true).
|
|
||||||
Border(customBorder)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Part of the bubbletea event loop, called every tick
|
|
||||||
func (m FilterTable) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|
||||||
var (
|
|
||||||
cmd tea.Cmd
|
|
||||||
cmds []tea.Cmd
|
|
||||||
)
|
|
||||||
|
|
||||||
m.Table, cmd = m.Table.Update(msg)
|
|
||||||
cmds = append(cmds, cmd)
|
|
||||||
|
|
||||||
// If the user is about to enter filter text, do NOT respond to
|
|
||||||
// key bindings, as they might be part of the filter!
|
|
||||||
if !m.Table.GetIsFilterInputFocused() {
|
|
||||||
switch msg := msg.(type) {
|
|
||||||
case tea.KeyMsg:
|
|
||||||
switch msg.String() {
|
|
||||||
case "q":
|
|
||||||
m.quitting = true
|
|
||||||
m.unchanged = false
|
|
||||||
cmds = append(cmds, tea.Quit)
|
|
||||||
|
|
||||||
case "ctrl+c":
|
|
||||||
m.quitting = true
|
|
||||||
m.unchanged = true
|
|
||||||
cmds = append(cmds, tea.Quit)
|
|
||||||
|
|
||||||
case "a":
|
|
||||||
m.ToggleAllSelected()
|
|
||||||
|
|
||||||
case "tab":
|
|
||||||
m.SelectNextColumn()
|
|
||||||
|
|
||||||
case "?":
|
|
||||||
m.ToggleHelp()
|
|
||||||
m.recalculateTable()
|
|
||||||
|
|
||||||
case "s":
|
|
||||||
m.Sort("alphanumeric")
|
|
||||||
|
|
||||||
case "n":
|
|
||||||
m.Sort("numeric")
|
|
||||||
|
|
||||||
case "d":
|
|
||||||
m.Sort("duration")
|
|
||||||
|
|
||||||
case "t":
|
|
||||||
m.Sort("time")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Happens when the terminal window has been resized
|
|
||||||
switch msg := msg.(type) {
|
|
||||||
case tea.WindowSizeMsg:
|
|
||||||
m.ctx.totalWidth = msg.Width
|
|
||||||
m.ctx.totalHeight = msg.Height
|
|
||||||
|
|
||||||
m.recalculateTable()
|
|
||||||
}
|
|
||||||
|
|
||||||
m.updateFooter()
|
|
||||||
|
|
||||||
return m, tea.Batch(cmds...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add some info to the footer
|
|
||||||
func (m *FilterTable) updateFooter() {
|
|
||||||
selected := m.Table.SelectedRows()
|
|
||||||
footer := fmt.Sprintf("selected: %d ", len(selected))
|
|
||||||
|
|
||||||
if m.Table.GetIsFilterInputFocused() {
|
|
||||||
footer = fmt.Sprintf("/%s %s", m.Table.GetCurrentFilter(), footer)
|
|
||||||
} else if m.Table.GetIsFilterActive() {
|
|
||||||
footer = fmt.Sprintf("Filter: %s %s", m.Table.GetCurrentFilter(), footer)
|
|
||||||
}
|
|
||||||
|
|
||||||
m.Table = m.Table.WithStaticFooter(HelpFooter + footer)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called on resize event (or if help has been toggled)
|
|
||||||
func (m *FilterTable) recalculateTable() {
|
|
||||||
m.Table = m.Table.
|
|
||||||
WithTargetWidth(m.calculateWidth()).
|
|
||||||
WithMinimumHeight(m.calculateHeight()).
|
|
||||||
WithPageSize(m.calculateHeight() - ExtraRows)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *FilterTable) calculateWidth() int {
|
|
||||||
return m.ctx.totalWidth - m.ctx.horizontalMargin
|
|
||||||
}
|
|
||||||
|
|
||||||
// Take help height into account, if enabled
|
|
||||||
func (m *FilterTable) calculateHeight() int {
|
|
||||||
height := m.Rows + ExtraRows
|
|
||||||
|
|
||||||
if height >= m.ctx.totalHeight {
|
|
||||||
height = m.ctx.totalHeight - m.ctx.verticalMargin
|
|
||||||
} else {
|
|
||||||
height = m.ctx.totalHeight
|
|
||||||
}
|
|
||||||
|
|
||||||
if m.ctx.showHelp {
|
|
||||||
height = height - HelpRows
|
|
||||||
}
|
|
||||||
|
|
||||||
return height
|
|
||||||
}
|
|
||||||
|
|
||||||
// Part of the bubbletable event view, called every tick
|
|
||||||
func (m FilterTable) View() string {
|
|
||||||
body := strings.Builder{}
|
|
||||||
|
|
||||||
if !m.quitting {
|
|
||||||
body.WriteString(m.Table.View())
|
|
||||||
|
|
||||||
if m.ctx.showHelp {
|
|
||||||
body.WriteString(Help)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return body.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// User hit the TAB key
|
|
||||||
func (m *FilterTable) SelectNextColumn() {
|
|
||||||
if m.ctx.selectedColumn == m.maxColumns-1 {
|
|
||||||
m.ctx.selectedColumn = 0
|
|
||||||
} else {
|
|
||||||
m.ctx.selectedColumn++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// entry point from outside tablizer into table editor
|
|
||||||
func tableEditor(conf *cfg.Config, data *Tabdata) (*Tabdata, error) {
|
|
||||||
// we render to STDERR to avoid dead lock when the user redirects STDOUT
|
|
||||||
// see https://github.com/charmbracelet/bubbletea/issues/860
|
|
||||||
//
|
|
||||||
// TODO: doesn't work with libgloss v2 anymore!
|
|
||||||
lipgloss.SetDefaultRenderer(lipgloss.NewRenderer(os.Stderr))
|
|
||||||
|
|
||||||
ctx := &Context{data: data}
|
|
||||||
|
|
||||||
// Output to STDERR because there's a known bubbletea/lipgloss
|
|
||||||
// issue: if a program with a tui is expected to write something
|
|
||||||
// to STDOUT when the tui is finished, then the styles do not
|
|
||||||
// work. So we write to STDERR (which works) and tablizer can
|
|
||||||
// still be used inside pipes.
|
|
||||||
program := tea.NewProgram(
|
|
||||||
NewModel(data, ctx),
|
|
||||||
tea.WithOutput(os.Stderr),
|
|
||||||
tea.WithAltScreen())
|
|
||||||
|
|
||||||
m, err := program.Run()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if m.(FilterTable).unchanged {
|
|
||||||
return data, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Data has been modified. Extract it, put it back into our own
|
|
||||||
// structure and give control back to cmdline tablizer.
|
|
||||||
filteredtable := m.(FilterTable)
|
|
||||||
|
|
||||||
data.entries = make([][]string, len(filteredtable.Table.SelectedRows()))
|
|
||||||
for pos, row := range m.(FilterTable).Table.SelectedRows() {
|
|
||||||
entry := make([]string, len(data.headers))
|
|
||||||
for idx, field := range data.headers {
|
|
||||||
cell := row.Data[strings.ToLower(field)]
|
|
||||||
switch value := cell.(type) {
|
|
||||||
case string:
|
|
||||||
entry[idx] = value
|
|
||||||
case table.StyledCell:
|
|
||||||
entry[idx] = value.Data.(string)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data.entries[pos] = entry
|
|
||||||
}
|
|
||||||
|
|
||||||
return data, err
|
|
||||||
}
|
|
||||||
51
lib/yank.go
51
lib/yank.go
@@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2022-2025 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 (
|
|
||||||
"log"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/tiagomelo/go-clipboard/clipboard"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
)
|
|
||||||
|
|
||||||
func yankColumns(conf cfg.Config, data *Tabdata) {
|
|
||||||
var yank []string
|
|
||||||
|
|
||||||
if len(data.entries) == 0 || len(conf.UseYankColumns) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, row := range data.entries {
|
|
||||||
for i, field := range row {
|
|
||||||
for _, idx := range conf.UseYankColumns {
|
|
||||||
if i == idx-1 {
|
|
||||||
yank = append(yank, field)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(yank) > 0 {
|
|
||||||
cb := clipboard.New(clipboard.ClipboardOptions{Primary: true})
|
|
||||||
if err := cb.CopyText(strings.Join(yank, " ")); err != nil {
|
|
||||||
log.Fatalln("error writing string to clipboard:", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright © 2025 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 (
|
|
||||||
"bytes"
|
|
||||||
"fmt"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/tiagomelo/go-clipboard/clipboard"
|
|
||||||
"github.com/tlinden/tablizer/cfg"
|
|
||||||
)
|
|
||||||
|
|
||||||
var yanktests = []struct {
|
|
||||||
name string
|
|
||||||
yank []int // -y$colum,$column... after processing
|
|
||||||
filter string
|
|
||||||
expect string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "one",
|
|
||||||
yank: []int{1},
|
|
||||||
filter: "beta",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func DISABLED_TestYankColumns(t *testing.T) {
|
|
||||||
cb := clipboard.New()
|
|
||||||
|
|
||||||
for _, testdata := range yanktests {
|
|
||||||
testname := fmt.Sprintf("yank-%s-filter-%s",
|
|
||||||
testdata.name, testdata.filter)
|
|
||||||
t.Run(testname, func(t *testing.T) {
|
|
||||||
conf := cfg.Config{
|
|
||||||
OutputMode: cfg.ASCII,
|
|
||||||
UseYankColumns: testdata.yank,
|
|
||||||
NoColor: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
conf.ApplyDefaults()
|
|
||||||
data := newData() // defined in printer_test.go, reused here
|
|
||||||
|
|
||||||
var writer bytes.Buffer
|
|
||||||
printData(&writer, conf, &data)
|
|
||||||
|
|
||||||
got, err := cb.PasteText()
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("failed to fetch yanked text from clipboard")
|
|
||||||
}
|
|
||||||
|
|
||||||
if got != testdata.expect {
|
|
||||||
t.Errorf("not yanked correctly:\n+++ got:\n%s\n+++ want:\n%s",
|
|
||||||
got, testdata.expect)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +1,16 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/rogpeppe/go-internal/testscript"
|
"github.com/rogpeppe/go-internal/testscript"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMain(m *testing.M) {
|
func TestMain(m *testing.M) {
|
||||||
testscript.Main(m, map[string]func(){
|
os.Exit(testscript.RunMain(m, map[string]func() int{
|
||||||
"tablizer": main,
|
"tablizer": Main,
|
||||||
})
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestTablizer(t *testing.T) {
|
func TestTablizer(t *testing.T) {
|
||||||
|
|||||||
9
mkrel.sh
9
mkrel.sh
@@ -42,15 +42,8 @@ for D in $DIST; do
|
|||||||
binfile="releases/${tool}-${os}-${arch}-${version}"
|
binfile="releases/${tool}-${os}-${arch}-${version}"
|
||||||
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"
|
||||||
pie=""
|
|
||||||
|
|
||||||
if test "$D" = "linux/amd64"; then
|
|
||||||
pie="-buildmode=pie"
|
|
||||||
fi
|
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
GOOS=${os} GOARCH=${arch} go build -tags osusergo,netgo -ldflags "-extldflags=-static -w -X 'github.com/tlinden/tablizer/cfg.VERSION=${version}'" --trimpath $pie -o ${binfile}
|
GOOS=${os} GOARCH=${arch} go build -o ${binfile} -ldflags "-X 'github.com/tlinden/tablizer/cfg.VERSION=${version}'"
|
||||||
strip --strip-all ${binfile}
|
|
||||||
mkdir -p ${tardir}
|
mkdir -p ${tardir}
|
||||||
cp ${binfile} README.md LICENSE ${tardir}/
|
cp ${binfile} README.md LICENSE ${tardir}/
|
||||||
echo 'tool = tablizer
|
echo 'tool = tablizer
|
||||||
|
|||||||
@@ -6,6 +6,10 @@ stdout Usage
|
|||||||
exec tablizer -V
|
exec tablizer -V
|
||||||
stdout version
|
stdout version
|
||||||
|
|
||||||
|
# manpage
|
||||||
|
exec tablizer -m
|
||||||
|
stdout SYNOPSIS
|
||||||
|
|
||||||
# completion
|
# completion
|
||||||
exec tablizer --completion bash
|
exec tablizer --completion bash
|
||||||
stdout __tablizer_init_completion
|
stdout __tablizer_init_completion
|
||||||
|
|||||||
50
tablizer.1
50
tablizer.1
@@ -133,7 +133,7 @@
|
|||||||
.\" ========================================================================
|
.\" ========================================================================
|
||||||
.\"
|
.\"
|
||||||
.IX Title "TABLIZER 1"
|
.IX Title "TABLIZER 1"
|
||||||
.TH TABLIZER 1 "2025-08-28" "1" "User Commands"
|
.TH TABLIZER 1 "2025-01-22" "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
|
||||||
@@ -149,16 +149,15 @@ tablizer \- Manipulate tabular output of other programs
|
|||||||
\& 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, \-\-numbering Enable header numbering
|
\& \-n, \-\-no\-numbering Disable header numbering
|
||||||
\& \-N, \-\-no\-color Disable pattern highlighting
|
\& \-N, \-\-no\-color Disable pattern highlighting
|
||||||
\& \-H, \-\-no\-headers Disable headers display
|
\& \-H, \-\-no\-headers Disable headers display
|
||||||
\& \-s, \-\-separator string Custom field separator
|
\& \-s, \-\-separator string Custom field separator
|
||||||
\& \-k, \-\-sort\-by int|name Sort by column (default: 1)
|
\& \-k, \-\-sort\-by int|name Sort by column (default: 1)
|
||||||
\& \-z, \-\-fuzzy Use fuzzy search [experimental]
|
\& \-z, \-\-fuzzy Use fuzzy search [experimental]
|
||||||
\& \-F, \-\-filter field[!]=reg Filter given field with regex, can be used multiple times
|
\& \-F, \-\-filter field=reg Filter given field with regex, can be used multiple times
|
||||||
\& \-T, \-\-transpose\-columns string Transpose the speficied columns (separated by ,)
|
\& \-T, \-\-transpose\-columns string Transpose the speficied columns (separated by ,)
|
||||||
\& \-R, \-\-regex\-transposer /from/to/ Apply /search/replace/ regexp to fields given in \-T
|
\& \-R, \-\-regex\-transposer /from/to/ Apply /search/replace/ regexp to fields given in \-T
|
||||||
\& \-I, \-\-interactive Interactively filter and select rows
|
|
||||||
\&
|
\&
|
||||||
\& Output Flags (mutually exclusive):
|
\& Output Flags (mutually exclusive):
|
||||||
\& \-X, \-\-extended Enable extended output
|
\& \-X, \-\-extended Enable extended output
|
||||||
@@ -169,8 +168,6 @@ tablizer \- Manipulate tabular output of other programs
|
|||||||
\& \-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
|
\& \-L, \-\-hightlight\-lines Use alternating background colors for tables
|
||||||
\& \-y, \-\-yank\-columns Yank specified columns (separated by ,) to clipboard,
|
|
||||||
\& space separated
|
|
||||||
\&
|
\&
|
||||||
\& 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
|
||||||
@@ -343,27 +340,7 @@ Fieldnames (== columns headers) are case insensitive.
|
|||||||
If you specify more than one filter, both filters have to match (\s-1AND\s0
|
If you specify more than one filter, both filters have to match (\s-1AND\s0
|
||||||
operation).
|
operation).
|
||||||
.PP
|
.PP
|
||||||
These field filters can also be negated:
|
|
||||||
.PP
|
|
||||||
.Vb 1
|
|
||||||
\& fieldname!=regexp
|
|
||||||
.Ve
|
|
||||||
.PP
|
|
||||||
If the option \fB\-v\fR is specified, the filtering is inverted.
|
If the option \fB\-v\fR is specified, the filtering is inverted.
|
||||||
.SS "\s-1INTERACTIVE FILTERING\s0"
|
|
||||||
.IX Subsection "INTERACTIVE FILTERING"
|
|
||||||
You can also use the interactive mode, enabled with \f(CW\*(C`\-I\*(C'\fR to filter
|
|
||||||
and select rows. This mode is complementary, that is, other filter
|
|
||||||
options are still being respected.
|
|
||||||
.PP
|
|
||||||
To enter e filter, hit \f(CW\*(C`/\*(C'\fR, enter a filter string and finish with
|
|
||||||
\&\f(CW\*(C`ENTER\*(C'\fR. Use \f(CW\*(C`SPACE\*(C'\fR to select/deselect rows, use \f(CW\*(C`a\*(C'\fR to select all
|
|
||||||
(visible) rows.
|
|
||||||
.PP
|
|
||||||
Commit your selection with \f(CW\*(C`q\*(C'\fR. The selected rows are being fed to
|
|
||||||
the requested output mode as usual. Abort with \f(CW\*(C`CTRL\-c\*(C'\fR, in which
|
|
||||||
case the results of the interactive mode are being ignored and all
|
|
||||||
rows are being fed to output.
|
|
||||||
.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
|
||||||
@@ -479,27 +456,13 @@ more output modes available: \fBorgtbl\fR which prints an Emacs org-mode
|
|||||||
table and \fBmarkdown\fR which prints a Markdown table, \fByaml\fR, which
|
table and \fBmarkdown\fR which prints a Markdown table, \fByaml\fR, which
|
||||||
prints yaml encoding and \s-1CSV\s0 mode, which prints a comma separated
|
prints yaml encoding and \s-1CSV\s0 mode, which prints a comma separated
|
||||||
value file.
|
value file.
|
||||||
.SS "\s-1PUT FIELDS TO CLIPBOARD\s0"
|
|
||||||
.IX Subsection "PUT FIELDS TO CLIPBOARD"
|
|
||||||
You can let tablizer put fields to the clipboard using the option
|
|
||||||
\&\f(CW\*(C`\-y\*(C'\fR. This best fits the use-case when the result of your filtering
|
|
||||||
yields just one row. For example:
|
|
||||||
.PP
|
|
||||||
.Vb 1
|
|
||||||
\& cloudctl cluster ls | tablizer \-yid matchbox
|
|
||||||
.Ve
|
|
||||||
.PP
|
|
||||||
If \*(L"matchbox\*(R" matches one cluster, you can immediately use the id of
|
|
||||||
that cluster somewhere else and paste it. Of course, if there are
|
|
||||||
multiple matches, then all id's will be put into the clipboard
|
|
||||||
separated by one space.
|
|
||||||
.SS "\s-1ENVIRONMENT VARIABLES\s0"
|
.SS "\s-1ENVIRONMENT VARIABLES\s0"
|
||||||
.IX Subsection "ENVIRONMENT VARIABLES"
|
.IX Subsection "ENVIRONMENT VARIABLES"
|
||||||
\&\fBtablizer\fR supports certain environment variables which use can use
|
\&\fBtablizer\fR supports certain environment variables which use can use
|
||||||
to influence program behavior. Commandline flags have always
|
to influence program behavior. Commandline flags have always
|
||||||
precedence over environment variables.
|
precedence over environment variables.
|
||||||
.IP "<T_HEADER_NUMBERING> \- enable numbering of header fields, like \fB\-n\fR." 4
|
.IP "<T_NO_HEADER_NUMBERING> \- disable numbering of header fields, like \fB\-n\fR." 4
|
||||||
.IX Item "<T_HEADER_NUMBERING> - enable numbering of header fields, like -n."
|
.IX Item "<T_NO_HEADER_NUMBERING> - disable numbering of header fields, like -n."
|
||||||
.PD 0
|
.PD 0
|
||||||
.IP "<T_COLUMNS> \- comma separated list of columns to output, like \fB\-c\fR" 4
|
.IP "<T_COLUMNS> \- comma separated list of columns to output, like \fB\-c\fR" 4
|
||||||
.IX Item "<T_COLUMNS> - comma separated list of columns to output, like -c"
|
.IX Item "<T_COLUMNS> - comma separated list of columns to output, like -c"
|
||||||
@@ -630,9 +593,6 @@ Released under the \s-1MIT\s0 License, Copyright (c) 201 by Oleku Konko
|
|||||||
.IP "yaml (gopkg.in/yaml.v3)" 4
|
.IP "yaml (gopkg.in/yaml.v3)" 4
|
||||||
.IX Item "yaml (gopkg.in/yaml.v3)"
|
.IX Item "yaml (gopkg.in/yaml.v3)"
|
||||||
Released under the \s-1MIT\s0 License, Copyright (c) 2006\-2011 Kirill Simonov
|
Released under the \s-1MIT\s0 License, Copyright (c) 2006\-2011 Kirill Simonov
|
||||||
.IP "bubble-table (https://github.com/Evertras/bubble\-table)" 4
|
|
||||||
.IX Item "bubble-table (https://github.com/Evertras/bubble-table)"
|
|
||||||
Released under the \s-1MIT\s0 License, Copyright (c) 2022 Brandon Fulljames
|
|
||||||
.SH "AUTHORS"
|
.SH "AUTHORS"
|
||||||
.IX Header "AUTHORS"
|
.IX Header "AUTHORS"
|
||||||
Thomas von Dein \fBtom \s-1AT\s0 vondein \s-1DOT\s0 org\fR
|
Thomas von Dein \fBtom \s-1AT\s0 vondein \s-1DOT\s0 org\fR
|
||||||
|
|||||||
44
tablizer.pod
44
tablizer.pod
@@ -10,16 +10,15 @@ tablizer - Manipulate tabular output of other programs
|
|||||||
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, --numbering Enable header numbering
|
-n, --no-numbering Disable header numbering
|
||||||
-N, --no-color Disable pattern highlighting
|
-N, --no-color Disable pattern highlighting
|
||||||
-H, --no-headers Disable headers display
|
-H, --no-headers Disable headers display
|
||||||
-s, --separator string Custom field separator
|
-s, --separator string Custom field separator
|
||||||
-k, --sort-by int|name Sort by column (default: 1)
|
-k, --sort-by int|name Sort by column (default: 1)
|
||||||
-z, --fuzzy Use fuzzy search [experimental]
|
-z, --fuzzy Use fuzzy search [experimental]
|
||||||
-F, --filter field[!]=reg Filter given field with regex, can be used multiple times
|
-F, --filter field=reg Filter given field with regex, can be used multiple times
|
||||||
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
-T, --transpose-columns string Transpose the speficied columns (separated by ,)
|
||||||
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
-R, --regex-transposer /from/to/ Apply /search/replace/ regexp to fields given in -T
|
||||||
-I, --interactive Interactively filter and select rows
|
|
||||||
|
|
||||||
Output Flags (mutually exclusive):
|
Output Flags (mutually exclusive):
|
||||||
-X, --extended Enable extended output
|
-X, --extended Enable extended output
|
||||||
@@ -30,8 +29,6 @@ tablizer - Manipulate tabular output of other programs
|
|||||||
-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
|
-L, --hightlight-lines Use alternating background colors for tables
|
||||||
-y, --yank-columns Yank specified columns (separated by ,) to clipboard,
|
|
||||||
space separated
|
|
||||||
|
|
||||||
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
|
||||||
@@ -197,26 +194,8 @@ Fieldnames (== columns headers) are case insensitive.
|
|||||||
If you specify more than one filter, both filters have to match (AND
|
If you specify more than one filter, both filters have to match (AND
|
||||||
operation).
|
operation).
|
||||||
|
|
||||||
These field filters can also be negated:
|
|
||||||
|
|
||||||
fieldname!=regexp
|
|
||||||
|
|
||||||
If the option B<-v> is specified, the filtering is inverted.
|
If the option B<-v> is specified, the filtering is inverted.
|
||||||
|
|
||||||
=head2 INTERACTIVE FILTERING
|
|
||||||
|
|
||||||
You can also use the interactive mode, enabled with C<-I> to filter
|
|
||||||
and select rows. This mode is complementary, that is, other filter
|
|
||||||
options are still being respected.
|
|
||||||
|
|
||||||
To enter e filter, hit C</>, enter a filter string and finish with
|
|
||||||
C<ENTER>. Use C<SPACE> to select/deselect rows, use C<a> to select all
|
|
||||||
(visible) rows.
|
|
||||||
|
|
||||||
Commit your selection with C<q>. The selected rows are being fed to
|
|
||||||
the requested output mode as usual. Abort with C<CTRL-c>, in which
|
|
||||||
case the results of the interactive mode are being ignored and all
|
|
||||||
rows are being fed to output.
|
|
||||||
|
|
||||||
=head2 COLUMNS
|
=head2 COLUMNS
|
||||||
|
|
||||||
@@ -323,19 +302,6 @@ table and B<markdown> which prints a Markdown table, B<yaml>, which
|
|||||||
prints yaml encoding and CSV mode, which prints a comma separated
|
prints yaml encoding and CSV mode, which prints a comma separated
|
||||||
value file.
|
value file.
|
||||||
|
|
||||||
=head2 PUT FIELDS TO CLIPBOARD
|
|
||||||
|
|
||||||
You can let tablizer put fields to the clipboard using the option
|
|
||||||
C<-y>. This best fits the use-case when the result of your filtering
|
|
||||||
yields just one row. For example:
|
|
||||||
|
|
||||||
cloudctl cluster ls | tablizer -yid matchbox
|
|
||||||
|
|
||||||
If "matchbox" matches one cluster, you can immediately use the id of
|
|
||||||
that cluster somewhere else and paste it. Of course, if there are
|
|
||||||
multiple matches, then all id's will be put into the clipboard
|
|
||||||
separated by one space.
|
|
||||||
|
|
||||||
=head2 ENVIRONMENT VARIABLES
|
=head2 ENVIRONMENT VARIABLES
|
||||||
|
|
||||||
B<tablizer> supports certain environment variables which use can use
|
B<tablizer> supports certain environment variables which use can use
|
||||||
@@ -344,7 +310,7 @@ precedence over environment variables.
|
|||||||
|
|
||||||
=over
|
=over
|
||||||
|
|
||||||
=item <T_HEADER_NUMBERING> - enable numbering of header fields, like B<-n>.
|
=item <T_NO_HEADER_NUMBERING> - disable numbering of header fields, like B<-n>.
|
||||||
|
|
||||||
=item <T_COLUMNS> - comma separated list of columns to output, like B<-c>
|
=item <T_COLUMNS> - comma separated list of columns to output, like B<-c>
|
||||||
|
|
||||||
@@ -480,10 +446,6 @@ Released under the MIT License, Copyright (c) 201 by Oleku Konko
|
|||||||
|
|
||||||
Released under the MIT License, Copyright (c) 2006-2011 Kirill Simonov
|
Released under the MIT License, Copyright (c) 2006-2011 Kirill Simonov
|
||||||
|
|
||||||
=item bubble-table (https://github.com/Evertras/bubble-table)
|
|
||||||
|
|
||||||
Released under the MIT License, Copyright (c) 2022 Brandon Fulljames
|
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
|
||||||
=head1 AUTHORS
|
=head1 AUTHORS
|
||||||
|
|||||||
Reference in New Issue
Block a user