Skip to content

Fix --json with new format #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2025
Merged

Fix --json with new format #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions cli/benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,19 @@ func runBench(ctx *cli.Context, b bench.Benchmark) error {
monitor.InfoLn(fmt.Sprintf("\nBenchmark data written to %q\n\n", fileName+".json.zst"))
}()
}
rep := final.Report(aggregate.ReportOptions{
Details: ctx.Bool("analyze.v"),
Color: !globalNoColor,
OnlyOps: getAnalyzeOPS(ctx),
})
var rep *bytes.Buffer
if globalJSON {
rep = &bytes.Buffer{}
enc := json.NewEncoder(rep)
enc.SetIndent("", " ")
_ = enc.Encode(final)
} else {
rep = final.Report(aggregate.ReportOptions{
Details: ctx.Bool("analyze.v"),
Color: !globalNoColor,
OnlyOps: getAnalyzeOPS(ctx),
})
}

monitor.UpdateAggregate(final, fileName)
ui.Update(tea.Quit())
Expand Down
8 changes: 6 additions & 2 deletions cli/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ func (u *ui) View() string {
func (u *ui) SetSubText(caption string) {
if u.quitPls.Load() {
u.Wait()
console.Printf("\r%-80s", caption)
if !globalQuiet && !globalJSON {
console.Printf("\r%-80s", caption)
}
return
}
u.phaseTxt.Store(&caption)
Expand All @@ -266,7 +268,9 @@ func (u *ui) SetSubText(caption string) {
func (u *ui) SetPhase(caption string) {
if u.quitPls.Load() {
u.Wait()
console.Println("\n" + caption)
if !globalQuiet && !globalJSON {
console.Println("\n" + caption)
}
return
}
u.phase.Store(&caption)
Expand Down
Loading