dimitar
c9ff44298c
Replace the interim renderers with a dedicated presenter package that
formats scan results in three ways.
Presenter (internal/presenter):
- Formatter interface with Present()/For() dispatch on format name:
table, json, compact
- TableFormatter: aligned tabwriter table with REPOSITORY / BRANCH /
STATUS / AHEAD-BEHIND / CHANGES / STASH columns, per-repo change
summaries like "2M 1U", error details inline, and a colored summary
line ("N repos | N clean | N need attention | N errors")
- JSONFormatter: indented document with scanned_at, parent_dir, repos,
and an aggregate summary for scripting; statuses render as string
labels ("modified") instead of raw integers
- CompactFormatter: one line per repo with color-coded status symbols
(✓ ✗ ↑ ↓ ⇄ ◉ ▢ !) plus branch, ahead/behind, and change counts
- Color handling: auto/always/never modes, TTY detection, and the
NO_COLOR convention (explicit --color=always still wins); paths have
$HOME collapsed to "~" in table and compact views
Domain model (pkg/status):
- JSON tags on RepoInfo/ScanResult/Summary for clean field names
- RepoStatus now marshals to its string label and unmarshals from both
string labels and numeric values, so JSON output round-trips
Configuration (internal/config):
- New --color flag (auto/always/never) validated in Load and included in
the config dump; keyed as "color" in viper
CLI (cmd/gitflow):
- scan now routes through presenter.Present with the resolved color mode;
the interim renderers are removed
Testing:
- Table content (columns, change summaries, error text, summary line) and
absence of escape codes with ColorNever
- ColorAlways emits ANSI codes even under NO_COLOR; auto stays clean on
non-terminal writers
- JSON decodes back into the domain types (string statuses round-trip)
- Compact symbols and counts; unknown formats rejected
- RepoStatus JSON round trip covers every status
Verified: go build, go vet, go test -race, gofmt clean; manual smoke of
table / compact / forced-color / JSON output against a scratch directory.
64 lines
1.4 KiB
Go
64 lines
1.4 KiB
Go
package presenter
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
|
|
"gitea.oblak.solutions/dimitar/gitFlow/pkg/status"
|
|
)
|
|
|
|
// CompactFormatter renders one line per repository with color-coded status
|
|
// symbols, aimed at dense terminals and dashboards.
|
|
type CompactFormatter struct {
|
|
opts Options
|
|
}
|
|
|
|
// Format implements Formatter.
|
|
func (c *CompactFormatter) Format(w io.Writer, result status.ScanResult) error {
|
|
r := newRenderer(c.opts.Color, w)
|
|
for _, repo := range result.Repos {
|
|
sym := statusSymbol(repo.Status)
|
|
line := r.paint(repo.Status, sym) + " " + shortPath(repo.Path)
|
|
if repo.Branch != "" && !repo.Detached {
|
|
line += " (" + repo.Branch + ")"
|
|
}
|
|
if repo.AheadBy > 0 || repo.BehindBy > 0 {
|
|
line += fmt.Sprintf(" +%d/-%d", repo.AheadBy, repo.BehindBy)
|
|
}
|
|
if n := repo.FileCount(); n > 0 {
|
|
line += fmt.Sprintf(" %d change(s)", n)
|
|
}
|
|
if repo.Status == status.StatusError {
|
|
line += ": " + repo.Error
|
|
}
|
|
if _, err := fmt.Fprintln(w, line); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// statusSymbol returns a single-character status marker.
|
|
func statusSymbol(s status.RepoStatus) string {
|
|
switch s {
|
|
case status.StatusClean:
|
|
return "✓"
|
|
case status.StatusModified:
|
|
return "✗"
|
|
case status.StatusAhead:
|
|
return "↑"
|
|
case status.StatusBehind:
|
|
return "↓"
|
|
case status.StatusDiverged:
|
|
return "⇄"
|
|
case status.StatusDetached:
|
|
return "◉"
|
|
case status.StatusBare:
|
|
return "▢"
|
|
case status.StatusError:
|
|
return "!"
|
|
default:
|
|
return "?"
|
|
}
|
|
}
|