From 1b28a07e1735717a9823c42de9a4738d3916d14e Mon Sep 17 00:00:00 2001 From: Cassowary Rusnov Date: Sun, 4 Dec 2022 13:43:32 -0800 Subject: [PATCH] Minor stylistic improvements to MR output in list. --- cli/app/list.go | 112 ++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/cli/app/list.go b/cli/app/list.go index b10663f0..4d93abb4 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -207,67 +207,67 @@ can take some time. } allStats[app.Server] = stats } - if internal.MachineReadable { + if (internal.MachineReadable) { jsonstring, err := json.Marshal(allStats) - if err != nil { - fmt.Println("Error marshalling data to JSON:") - fmt.Println(err) + if (err != nil) { + logrus.Fatal(err) } else { fmt.Println(string(jsonstring)) } - } else { - 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 } + 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 }, }