forked from toolshed/abra
Minor stylistic improvements to MR output in list.
This commit is contained in:
parent
82866cd213
commit
1b28a07e17
112
cli/app/list.go
112
cli/app/list.go
@ -207,67 +207,67 @@ can take some time.
|
|||||||
}
|
}
|
||||||
allStats[app.Server] = stats
|
allStats[app.Server] = stats
|
||||||
}
|
}
|
||||||
if internal.MachineReadable {
|
if (internal.MachineReadable) {
|
||||||
jsonstring, err := json.Marshal(allStats)
|
jsonstring, err := json.Marshal(allStats)
|
||||||
if err != nil {
|
if (err != nil) {
|
||||||
fmt.Println("Error marshalling data to JSON:")
|
logrus.Fatal(err)
|
||||||
fmt.Println(err)
|
|
||||||
} else {
|
} else {
|
||||||
fmt.Println(string(jsonstring))
|
fmt.Println(string(jsonstring))
|
||||||
}
|
}
|
||||||
} else {
|
return nil
|
||||||
alreadySeen := make(map[string]bool)
|
|
||||||
for _, app := range apps {
|
|
||||||
if _, ok := alreadySeen[app.Server]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
serverStat := allStats[app.Server]
|
|
||||||
|
|
||||||
tableCol := []string{"recipe", "domain"}
|
|
||||||
if status {
|
|
||||||
tableCol = append(tableCol, []string{"status", "version", "upgrade"}...)
|
|
||||||
}
|
|
||||||
|
|
||||||
table := formatter.CreateTable(tableCol)
|
|
||||||
|
|
||||||
for _, appStat := range serverStat.Apps {
|
|
||||||
tableRow := []string{appStat.Recipe, appStat.Domain}
|
|
||||||
if status {
|
|
||||||
tableRow = append(tableRow, []string{appStat.Status, appStat.Version, appStat.Upgrade}...)
|
|
||||||
}
|
|
||||||
table.Append(tableRow)
|
|
||||||
}
|
|
||||||
|
|
||||||
if table.NumLines() > 0 {
|
|
||||||
table.Render()
|
|
||||||
|
|
||||||
if status {
|
|
||||||
fmt.Println(fmt.Sprintf(
|
|
||||||
"server: %s | total apps: %v | versioned: %v | unversioned: %v | latest: %v | upgrade: %v",
|
|
||||||
app.Server,
|
|
||||||
serverStat.AppCount,
|
|
||||||
serverStat.VersionCount,
|
|
||||||
serverStat.UnversionedCount,
|
|
||||||
serverStat.LatestCount,
|
|
||||||
serverStat.UpgradeCount,
|
|
||||||
))
|
|
||||||
} else {
|
|
||||||
fmt.Println(fmt.Sprintf("server: %s | total apps: %v", app.Server, serverStat.AppCount))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(allStats) > 1 && table.NumLines() > 0 {
|
|
||||||
fmt.Println() // newline separator for multiple servers
|
|
||||||
}
|
|
||||||
|
|
||||||
alreadySeen[app.Server] = true
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(allStats) > 1 {
|
|
||||||
fmt.Println(fmt.Sprintf("total servers: %v | total apps: %v ", totalServersCount, totalAppsCount))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
alreadySeen := make(map[string]bool)
|
||||||
|
for _, app := range apps {
|
||||||
|
if _, ok := alreadySeen[app.Server]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
serverStat := allStats[app.Server]
|
||||||
|
|
||||||
|
tableCol := []string{"recipe", "domain"}
|
||||||
|
if status {
|
||||||
|
tableCol = append(tableCol, []string{"status", "version", "upgrade"}...)
|
||||||
|
}
|
||||||
|
|
||||||
|
table := formatter.CreateTable(tableCol)
|
||||||
|
|
||||||
|
for _, appStat := range serverStat.Apps {
|
||||||
|
tableRow := []string{appStat.Recipe, appStat.Domain}
|
||||||
|
if status {
|
||||||
|
tableRow = append(tableRow, []string{appStat.Status, appStat.Version, appStat.Upgrade}...)
|
||||||
|
}
|
||||||
|
table.Append(tableRow)
|
||||||
|
}
|
||||||
|
|
||||||
|
if table.NumLines() > 0 {
|
||||||
|
table.Render()
|
||||||
|
|
||||||
|
if status {
|
||||||
|
fmt.Println(fmt.Sprintf(
|
||||||
|
"server: %s | total apps: %v | versioned: %v | unversioned: %v | latest: %v | upgrade: %v",
|
||||||
|
app.Server,
|
||||||
|
serverStat.AppCount,
|
||||||
|
serverStat.VersionCount,
|
||||||
|
serverStat.UnversionedCount,
|
||||||
|
serverStat.LatestCount,
|
||||||
|
serverStat.UpgradeCount,
|
||||||
|
))
|
||||||
|
} else {
|
||||||
|
fmt.Println(fmt.Sprintf("server: %s | total apps: %v", app.Server, serverStat.AppCount))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(allStats) > 1 && table.NumLines() > 0 {
|
||||||
|
fmt.Println() // newline separator for multiple servers
|
||||||
|
}
|
||||||
|
|
||||||
|
alreadySeen[app.Server] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(allStats) > 1 {
|
||||||
|
fmt.Println(fmt.Sprintf("total servers: %v | total apps: %v ", totalServersCount, totalAppsCount))
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user