Merge pull request #7975 from jwhonce/jira/run-898-4

Restore --format table...

1 files changed, 30 insertions, 64 deletions

diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go
index 1d916dbfa..2f59e4e47 100644
--- a/cmd/podman/pods/stats.go
+++ b/cmd/podman/pods/stats.go
@@ -4,18 +4,16 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"reflect"
-	"strings"
 	"text/tabwriter"
 	"text/template"
 	"time"
 
 	"github.com/buger/goterm"
-	"github.com/containers/buildah/pkg/formats"
+	"github.com/containers/podman/v2/cmd/podman/parse"
 	"github.com/containers/podman/v2/cmd/podman/registry"
+	"github.com/containers/podman/v2/cmd/podman/report"
 	"github.com/containers/podman/v2/cmd/podman/validate"
 	"github.com/containers/podman/v2/pkg/domain/entities"
-	"github.com/containers/podman/v2/pkg/util/camelcase"
 	"github.com/spf13/cobra"
 )
 
@@ -67,11 +65,18 @@ func stats(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	format := statsOptions.Format
-	doJSON := strings.ToLower(format) == formats.JSONString
-	header := getPodStatsHeader(format)
+	row := report.NormalizeFormat(statsOptions.Format)
+	doJSON := parse.MatchesJSONFormat(row)
 
-	for {
+	headers := report.Headers(entities.PodStatsReport{}, map[string]string{
+		"CPU":      "CPU %",
+		"MemUsage": "MEM USAGE/ LIMIT",
+		"MEM":      "MEM %",
+		"NET IO":   "NET IO",
+		"BlockIO":  "BLOCK IO",
+	})
+
+	for ; ; time.Sleep(time.Second) {
 		reports, err := registry.ContainerEngine().PodStats(context.Background(), args, statsOptions.PodStatsOptions)
 		if err != nil {
 			return err
@@ -87,16 +92,17 @@ func stats(cmd *cobra.Command, args []string) error {
 				goterm.MoveCursor(1, 1)
 				goterm.Flush()
 			}
-			if len(format) == 0 {
+			if cmd.Flags().Changed("format") {
+				if err := printFormattedPodStatsLines(headers, row, reports); err != nil {
+					return err
+				}
+			} else {
 				printPodStatsLines(reports)
-			} else if err := printFormattedPodStatsLines(format, reports, header); err != nil {
-				return err
 			}
 		}
 		if statsOptions.NoStream {
 			break
 		}
-		time.Sleep(time.Second)
 	}
 
 	return nil
@@ -115,72 +121,32 @@ func printPodStatsLines(stats []*entities.PodStatsReport) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	outFormat := "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n"
 	fmt.Fprintf(w, outFormat, "POD", "CID", "NAME", "CPU %", "MEM USAGE/ LIMIT", "MEM %", "NET IO", "BLOCK IO", "PIDS")
-	for _, i := range stats {
-		if len(stats) == 0 {
-			fmt.Fprintf(w, outFormat, i.Pod, "--", "--", "--", "--", "--", "--", "--", "--")
-		} else {
+	if len(stats) == 0 {
+		fmt.Fprintf(w, outFormat, "--", "--", "--", "--", "--", "--", "--", "--", "--")
+	} else {
+		for _, i := range stats {
 			fmt.Fprintf(w, outFormat, i.Pod, i.CID, i.Name, i.CPU, i.MemUsage, i.Mem, i.NetIO, i.BlockIO, i.PIDS)
 		}
 	}
 	w.Flush()
 }
 
-func printFormattedPodStatsLines(format string, stats []*entities.PodStatsReport, headerNames map[string]string) error {
+func printFormattedPodStatsLines(headerNames []map[string]string, row string, stats []*entities.PodStatsReport) error {
 	if len(stats) == 0 {
 		return nil
 	}
 
-	// Use a tabwriter to align column format
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-	// Spit out the header if "table" is present in the format
-	if strings.HasPrefix(format, "table") {
-		hformat := strings.Replace(strings.TrimSpace(format[5:]), " ", "\t", -1)
-		format = hformat
-		headerTmpl, err := template.New("header").Parse(hformat)
-		if err != nil {
-			return err
-		}
-		if err := headerTmpl.Execute(w, headerNames); err != nil {
-			return err
-		}
-		fmt.Fprintln(w, "")
-	}
+	row = "{{range .}}" + row + "{{end}}"
 
-	// Spit out the data rows now
-	dataTmpl, err := template.New("data").Parse(format)
+	tmpl, err := template.New("pod stats").Parse(row)
 	if err != nil {
 		return err
 	}
-	for _, s := range stats {
-		if err := dataTmpl.Execute(w, s); err != nil {
-			return err
-		}
-		fmt.Fprintln(w, "")
-	}
-	// Flush the writer
-	return w.Flush()
-
-}
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
+	defer w.Flush()
 
-// getPodStatsHeader returns the stats header for the specified options.
-func getPodStatsHeader(format string) map[string]string {
-	headerNames := make(map[string]string)
-	if format == "" {
-		return headerNames
-	}
-	// Make a map of the field names for the headers
-	v := reflect.ValueOf(entities.PodStatsReport{})
-	t := v.Type()
-	for i := 0; i < t.NumField(); i++ {
-		split := camelcase.Split(t.Field(i).Name)
-		value := strings.ToUpper(strings.Join(split, " "))
-		switch value {
-		case "CPU", "MEM":
-			value += " %"
-		case "MEM USAGE":
-			value = "MEM USAGE / LIMIT"
-		}
-		headerNames[t.Field(i).Name] = value
+	if err := tmpl.Execute(w, headerNames); err != nil {
+		return err
 	}
-	return headerNames
+	return tmpl.Execute(w, stats)
 }