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.
76 lines
2.0 KiB
Go
76 lines
2.0 KiB
Go
package presenter
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"strconv"
|
|
"strings"
|
|
"text/tabwriter"
|
|
|
|
"gitea.oblak.solutions/dimitar/gitFlow/pkg/status"
|
|
)
|
|
|
|
// TableFormatter renders repositories as an aligned terminal table followed
|
|
// by a summary line.
|
|
type TableFormatter struct {
|
|
opts Options
|
|
}
|
|
|
|
// Format implements Formatter.
|
|
func (t *TableFormatter) Format(w io.Writer, result status.ScanResult) error {
|
|
r := newRenderer(t.opts.Color, w)
|
|
tw := tabwriter.NewWriter(w, 2, 4, 2, ' ', 0)
|
|
|
|
fmt.Fprintln(tw, "REPOSITORY\tBRANCH\tSTATUS\tAHEAD/BEHIND\tCHANGES\tSTASH")
|
|
for _, repo := range result.Repos {
|
|
branch := repo.Branch
|
|
if branch == "" {
|
|
branch = "-"
|
|
}
|
|
ab := "-"
|
|
if repo.Status != status.StatusError && (repo.RemoteURL != "" || repo.AheadBy > 0 || repo.BehindBy > 0) {
|
|
ab = fmt.Sprintf("%d/%d", repo.AheadBy, repo.BehindBy)
|
|
}
|
|
changes := "-"
|
|
switch {
|
|
case repo.Status == status.StatusError:
|
|
changes = repo.Error
|
|
case repo.FileCount() > 0:
|
|
changes = summarizeChanges(repo)
|
|
}
|
|
stash := "-"
|
|
if repo.StashCount > 0 {
|
|
stash = strconv.Itoa(repo.StashCount)
|
|
}
|
|
fmt.Fprintf(tw, "%s\t%s\t%s\t%s\t%s\t%s\n",
|
|
shortPath(repo.Path), branch, r.paint(repo.Status, repo.Status.String()), ab, changes, stash)
|
|
}
|
|
if err := tw.Flush(); err != nil {
|
|
return err
|
|
}
|
|
|
|
s := result.Summary()
|
|
label := "repos"
|
|
if s.Total == 1 {
|
|
label = "repo"
|
|
}
|
|
fmt.Fprintf(w, "\n%d %s | %s clean | %d need attention | %d errors\n",
|
|
s.Total, label, r.paint(status.StatusClean, strconv.Itoa(s.Clean)), s.Attention, s.Errored)
|
|
return nil
|
|
}
|
|
|
|
// summarizeChanges renders staged/modified/untracked counts, e.g. "2M 1U".
|
|
func summarizeChanges(repo status.RepoInfo) string {
|
|
parts := make([]string, 0, 3)
|
|
if n := len(repo.StagedFiles); n > 0 {
|
|
parts = append(parts, fmt.Sprintf("%dS", n))
|
|
}
|
|
if n := len(repo.ModifiedFiles); n > 0 {
|
|
parts = append(parts, fmt.Sprintf("%dM", n))
|
|
}
|
|
if n := len(repo.UntrackedFiles); n > 0 {
|
|
parts = append(parts, fmt.Sprintf("%dU", n))
|
|
}
|
|
return strings.Join(parts, " ")
|
|
}
|