tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Ib785bd1c,Icd05ee3a into main

Browse source 
* changes:
  Show ETA only if it is smart status
  Remove not-used field in smart_status
This commit is contained in:
Jeongik Cha 2023-11-30 08:20:31 +00:00 committed by Gerrit Code Review
commit 340a2b8d3f
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ui/terminal/format.go
View file

@ -25,6 +25,7 @@ import (
type formatter struct {
format string
quiet bool
smart bool
start time.Time
}
@ -32,10 +33,11 @@ type formatter struct {
// the terminal in a format similar to Ninja.
// format takes nearly all the same options as NINJA_STATUS.
// %c is currently unsupported.
func newFormatter(format string, quiet bool) formatter {
func newFormatter(format string, quiet bool, smart bool) formatter {
return formatter{
format: format,
quiet: quiet,
smart: smart,
start: time.Now(),
}
}
@ -61,8 +63,9 @@ func remainingTimeString(t time.Time) string {
func (s formatter) progress(counts status.Counts) string {
if s.format == "" {
output := fmt.Sprintf("[%3d%% %d/%d", 100*counts.FinishedActions/counts.TotalActions, counts.FinishedActions, counts.TotalActions)
if !counts.EstimatedTime.IsZero() {
// Not to break parsing logic in the build bot
// TODO(b/313981966): make buildbot more flexible for output format
if s.smart && !counts.EstimatedTime.IsZero() {
output += fmt.Sprintf(" %s remaining", remainingTimeString(counts.EstimatedTime))
}
output += "] "

5
ui/terminal/smart_status.go
View file

@ -31,9 +31,8 @@ import (
const tableHeightEnVar = "SOONG_UI_TABLE_HEIGHT"
type actionTableEntry struct {
action *status.Action
startTime time.Time
estimatedEndTime time.Time
action *status.Action
startTime time.Time
}
type smartStatusOutput struct {

5
ui/terminal/status.go
View file

@ -27,9 +27,10 @@ import (
// statusFormat takes nearly all the same options as NINJA_STATUS.
// %c is currently unsupported.
func NewStatusOutput(w io.Writer, statusFormat string, forceSimpleOutput, quietBuild, forceKeepANSI bool) status.StatusOutput {
formatter := newFormatter(statusFormat, quietBuild)
useSmartStatus := !forceSimpleOutput && isSmartTerminal(w)
formatter := newFormatter(statusFormat, quietBuild, useSmartStatus)
if !forceSimpleOutput && isSmartTerminal(w) {
if useSmartStatus {
return NewSmartStatusOutput(w, formatter)
} else {
return NewSimpleStatusOutput(w, formatter, forceKeepANSI)