mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 06:24:18 +02:00
satisfy full linter (#77)
This commit is contained in:
@@ -26,6 +26,7 @@ import (
|
||||
)
|
||||
|
||||
func any2string(in any) string {
|
||||
//nolint:gocritic
|
||||
switch val := in.(type) {
|
||||
case string:
|
||||
return val
|
||||
@@ -45,10 +46,10 @@ func any2string(in any) string {
|
||||
return val.Format("2006-01-02 15:04:05")
|
||||
case []byte:
|
||||
return string(val)
|
||||
case types.DateTime, types.Percentage:
|
||||
return val.(string)
|
||||
case nil:
|
||||
return "null"
|
||||
case types.Percentage, types.DateTime:
|
||||
return val.(string)
|
||||
}
|
||||
|
||||
return ""
|
||||
@@ -78,6 +79,7 @@ func (data *Table) preprocessRows() {
|
||||
// determine max width per column
|
||||
for _, entries := range data.rows {
|
||||
currentWidth := 0
|
||||
|
||||
for idx, entry := range entries {
|
||||
length := visibleLen(entry)
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ func PrintDocs(conf *cfg.Config, hits []types.Hit) {
|
||||
for _, hit := range hits {
|
||||
PrintDoc(conf, hit)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func PrintDoc(conf *cfg.Config, hit types.Hit) {
|
||||
|
||||
@@ -34,12 +34,14 @@ 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)
|
||||
}()
|
||||
)
|
||||
@@ -56,10 +58,9 @@ func (m model) Init() tea.Cmd {
|
||||
}
|
||||
|
||||
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
var (
|
||||
cmd tea.Cmd
|
||||
cmds []tea.Cmd
|
||||
)
|
||||
var cmd tea.Cmd
|
||||
|
||||
cmds := make([]tea.Cmd, 1)
|
||||
|
||||
switch msg := msg.(type) {
|
||||
case tea.KeyMsg:
|
||||
@@ -90,7 +91,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||
|
||||
// Handle keyboard and mouse events in the viewport
|
||||
m.viewport, cmd = m.viewport.Update(msg)
|
||||
cmds = append(cmds, cmd)
|
||||
cmds[0] = cmd
|
||||
|
||||
return m, tea.Batch(cmds...)
|
||||
}
|
||||
@@ -99,6 +100,7 @@ func (m model) View() string {
|
||||
if !m.ready {
|
||||
return "\n Initializing..."
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
|
||||
}
|
||||
|
||||
@@ -106,23 +108,25 @@ func (m model) 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 model) 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 Pager(title, message string) {
|
||||
p := tea.NewProgram(
|
||||
pager := tea.NewProgram(
|
||||
model{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 {
|
||||
if _, err := pager.Run(); err != nil {
|
||||
fmt.Println("could not run pager:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@@ -55,6 +55,7 @@ func NewTable(conf *cfg.Config, columns, rows int) *Table {
|
||||
func NewTableEmpty(conf *cfg.Config) *Table {
|
||||
table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
|
||||
table.alignInts = conf.AlignInts
|
||||
|
||||
return &table
|
||||
}
|
||||
|
||||
@@ -70,14 +71,14 @@ func (table *Table) WithHeaders(headers ...string) *Table {
|
||||
return table
|
||||
}
|
||||
|
||||
func (data *Table) Print() error {
|
||||
switch data.Mode {
|
||||
func (table *Table) Print() error {
|
||||
switch table.Mode {
|
||||
case "json":
|
||||
return data.PrintJSON()
|
||||
return table.PrintJSON()
|
||||
case "yaml":
|
||||
return data.PrintYAML()
|
||||
return table.PrintYAML()
|
||||
default:
|
||||
return data.PrintTSV()
|
||||
return table.PrintTSV()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,22 +86,8 @@ var (
|
||||
ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`)
|
||||
)
|
||||
|
||||
// needed for json and yaml output
|
||||
func (data *Table) toMap() []map[string]any {
|
||||
raw := make([]map[string]any, len(data.Entries))
|
||||
|
||||
for idx, entries := range data.Entries {
|
||||
raw[idx] = make(map[string]any, len(data.Headers))
|
||||
for eidx, entry := range entries {
|
||||
raw[idx][data.Headers[eidx]] = entry
|
||||
}
|
||||
}
|
||||
|
||||
return raw
|
||||
}
|
||||
|
||||
func (data *Table) PrintYAML() error {
|
||||
raw := data.toMap()
|
||||
func (table *Table) PrintYAML() error {
|
||||
raw := table.toMap()
|
||||
|
||||
body, err := yaml.Marshal(raw)
|
||||
if err != nil {
|
||||
@@ -112,8 +99,8 @@ func (data *Table) PrintYAML() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (data *Table) PrintJSON() error {
|
||||
raw := data.toMap()
|
||||
func (table *Table) PrintJSON() error {
|
||||
raw := table.toMap()
|
||||
|
||||
body, err := json.MarshalIndent(raw, "", " ")
|
||||
if err != nil {
|
||||
@@ -125,34 +112,35 @@ func (data *Table) PrintJSON() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (data *Table) PrintTSV() error {
|
||||
func (table *Table) PrintTSV() error {
|
||||
// length's, convert cell types
|
||||
data.preprocessRows()
|
||||
table.preprocessRows()
|
||||
|
||||
// output headers
|
||||
for idx, header := range data.Headers {
|
||||
if idx+1 != len(data.Headers) {
|
||||
fmt.Print(header, strings.Repeat(" ", data.lenHeaders[idx]-visibleLen(header)))
|
||||
for idx, header := range table.Headers {
|
||||
if idx+1 != len(table.Headers) {
|
||||
fmt.Print(header, strings.Repeat(" ", table.lenHeaders[idx]-visibleLen(header)))
|
||||
} else {
|
||||
// no padding for last header
|
||||
fmt.Print(header)
|
||||
}
|
||||
|
||||
if idx < len(data.Headers)-1 {
|
||||
if idx < len(table.Headers)-1 {
|
||||
fmt.Print(" ")
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println()
|
||||
|
||||
for _, entries := range data.rows {
|
||||
for _, entries := range table.rows {
|
||||
currentWidth := 0
|
||||
|
||||
for idx, entry := range entries {
|
||||
length := visibleLen(entry)
|
||||
|
||||
if length+currentWidth > data.maxwidth && data.maxwidth-currentWidth > 1 {
|
||||
if length+currentWidth > table.maxwidth && table.maxwidth-currentWidth > 1 {
|
||||
// text is too wide to be put into one line, wrap it
|
||||
wrapper := wordwrap.Wrapper(data.maxwidth-currentWidth, false)
|
||||
wrapper := wordwrap.Wrapper(table.maxwidth-currentWidth, false)
|
||||
wrapped := wrapper(entry)
|
||||
|
||||
// and indent it
|
||||
@@ -165,55 +153,71 @@ func (data *Table) PrintTSV() error {
|
||||
}
|
||||
}
|
||||
|
||||
currentWidth += data.lenHeaders[idx]
|
||||
currentWidth += table.lenHeaders[idx]
|
||||
|
||||
if isInt(entry) && data.alignInts {
|
||||
switch {
|
||||
case isInt(entry) && table.alignInts:
|
||||
// align right
|
||||
fmt.Print(strings.Repeat(" ", data.lenHeaders[idx]-length), entry)
|
||||
} else if length < data.lenHeaders[idx] && idx+1 != len(entries) {
|
||||
fmt.Print(strings.Repeat(" ", table.lenHeaders[idx]-length), entry)
|
||||
case length < table.lenHeaders[idx] && idx+1 != len(entries):
|
||||
// pad right, if required
|
||||
fmt.Print(entry, strings.Repeat(" ", data.lenHeaders[idx]-length))
|
||||
} else {
|
||||
fmt.Print(entry, strings.Repeat(" ", table.lenHeaders[idx]-length))
|
||||
default:
|
||||
// no padding for last entry
|
||||
fmt.Print(entry)
|
||||
}
|
||||
|
||||
if idx < len(data.Headers)-1 {
|
||||
if idx < len(table.Headers)-1 {
|
||||
fmt.Print(" ")
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Println()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (data *Table) Sort() {
|
||||
func (table *Table) Sort() {
|
||||
// sanity checks
|
||||
if len(data.Entries) == 0 {
|
||||
if len(table.Entries) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
data.preprocessRows()
|
||||
table.preprocessRows()
|
||||
|
||||
sort.Slice(data.rows, func(i, j int) bool {
|
||||
return data.rows[i][0] < data.rows[j][0]
|
||||
sort.Slice(table.rows, func(i, j int) bool {
|
||||
return table.rows[i][0] < table.rows[j][0]
|
||||
})
|
||||
}
|
||||
|
||||
func (data *Table) Addheaders(headers ...string) {
|
||||
func (table *Table) Addheaders(headers ...string) {
|
||||
for idx, header := range headers {
|
||||
switch data.Mode {
|
||||
switch table.Mode {
|
||||
case "json", "yaml":
|
||||
data.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
||||
table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
||||
default:
|
||||
data.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
||||
table.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (data *Table) AddRow(fields ...any) {
|
||||
data.Entries = append(data.Entries, fields)
|
||||
func (table *Table) AddRow(fields ...any) {
|
||||
table.Entries = append(table.Entries, fields)
|
||||
}
|
||||
|
||||
// needed for json and yaml output
|
||||
func (table *Table) toMap() []map[string]any {
|
||||
raw := make([]map[string]any, len(table.Entries))
|
||||
|
||||
for idx, entries := range table.Entries {
|
||||
raw[idx] = make(map[string]any, len(table.Headers))
|
||||
for eidx, entry := range entries {
|
||||
raw[idx][table.Headers[eidx]] = entry
|
||||
}
|
||||
}
|
||||
|
||||
return raw
|
||||
}
|
||||
|
||||
// return the length of a string but only visible chars, w/o ansi color escapes
|
||||
|
||||
Reference in New Issue
Block a user