podmanv2 history and image remove templates

remove the use of template functions images and history to allow for straight-forward user experience.  instead of templates we use structs and struct methods.

Signed-off-by: Brent Baude <bbaude@redhat.com>

2 files changed, 75 insertions, 23 deletions

diff --git a/cmd/podmanV2/images/history.go b/cmd/podmanV2/images/history.go
index f6f15e2f2..48575b33a 100644
--- a/cmd/podmanV2/images/history.go
+++ b/cmd/podmanV2/images/history.go
@@ -8,10 +8,11 @@ import (
 	"text/tabwriter"
 	"text/template"
 	"time"
+	"unicode"
 
 	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/cmd/podmanV2/report"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/docker/go-units"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -86,10 +87,13 @@ func history(cmd *cobra.Command, args []string) error {
 		}
 		return err
 	}
-
+	var hr []historyreporter
+	for _, l := range results.Layers {
+		hr = append(hr, historyreporter{l})
+	}
 	// Defaults
 	hdr := "ID\tCREATED\tCREATED BY\tSIZE\tCOMMENT\n"
-	row := "{{slice .ID 0 12}}\t{{humanDuration .Created}}\t{{ellipsis .CreatedBy 45}}\t{{.Size}}\t{{.Comment}}\n"
+	row := "{{.ID}}\t{{.Created}}\t{{.CreatedBy}}\t{{.Size}}\t{{.Comment}}\n"
 
 	if len(opts.format) > 0 {
 		hdr = ""
@@ -100,9 +104,9 @@ func history(cmd *cobra.Command, args []string) error {
 	} else {
 		switch {
 		case opts.human:
-			row = "{{slice .ID 0 12}}\t{{humanDuration .Created}}\t{{ellipsis .CreatedBy 45}}\t{{humanSize .Size}}\t{{.Comment}}\n"
+			row = "{{.ID}}\t{{.Created}}\t{{.CreatedBy}}\t{{.Size}}\t{{.Comment}}\n"
 		case opts.noTrunc:
-			row = "{{.ID}}\t{{humanDuration .Created}}\t{{.CreatedBy}}\t{{humanSize .Size}}\t{{.Comment}}\n"
+			row = "{{.ID}}\t{{.Created}}\t{{.CreatedBy}}\t{{.Size}}\t{{.Comment}}\n"
 		case opts.quiet:
 			hdr = ""
 			row = "{{.ID}}\n"
@@ -110,14 +114,40 @@ func history(cmd *cobra.Command, args []string) error {
 	}
 	format := hdr + "{{range . }}" + row + "{{end}}"
 
-	tmpl := template.Must(template.New("report").Funcs(report.PodmanTemplateFuncs()).Parse(format))
+	tmpl := template.Must(template.New("report").Parse(format))
 	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
-
-	_, _ = w.Write(report.ReportHeader("id", "created", "created by", "size", "comment"))
-	err = tmpl.Execute(w, results.Layers)
+	err = tmpl.Execute(w, hr)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, errors.Wrapf(err, "Failed to print report"))
 	}
 	w.Flush()
 	return nil
 }
+
+type historyreporter struct {
+	entities.ImageHistoryLayer
+}
+
+func (h historyreporter) Created() string {
+	return units.HumanDuration(time.Since(time.Unix(h.ImageHistoryLayer.Created, 0))) + " ago"
+}
+
+func (h historyreporter) Size() string {
+	s := units.HumanSizeWithPrecision(float64(h.ImageHistoryLayer.Size), 3)
+	i := strings.LastIndexFunc(s, unicode.IsNumber)
+	return s[:i+1] + " " + s[i+1:]
+}
+
+func (h historyreporter) CreatedBy() string {
+	if len(h.ImageHistoryLayer.CreatedBy) > 45 {
+		return h.ImageHistoryLayer.CreatedBy[:45-3] + "..."
+	}
+	return h.ImageHistoryLayer.CreatedBy
+}
+
+func (h historyreporter) ID() string {
+	if !opts.noTrunc && len(h.ImageHistoryLayer.ID) >= 12 {
+		return h.ImageHistoryLayer.ID[0:12]
+	}
+	return h.ImageHistoryLayer.ID
+}
diff --git a/cmd/podmanV2/images/list.go b/cmd/podmanV2/images/list.go
index 6b02e239e..d594a4323 100644
--- a/cmd/podmanV2/images/list.go
+++ b/cmd/podmanV2/images/list.go
@@ -9,10 +9,11 @@ import (
 	"text/tabwriter"
 	"text/template"
 	"time"
+	"unicode"
 
 	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/cmd/podmanV2/report"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/docker/go-units"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -133,16 +134,10 @@ func writeTemplate(imageS []*entities.ImageSummary, err error) error {
 	var (
 		hdr, row string
 	)
-	type image struct {
-		entities.ImageSummary
-		Repository string `json:"repository,omitempty"`
-		Tag        string `json:"tag,omitempty"`
-	}
-
-	imgs := make([]image, 0, len(imageS))
+	imgs := make([]imageReporter, 0, len(imageS))
 	for _, e := range imageS {
 		for _, tag := range e.RepoTags {
-			var h image
+			var h imageReporter
 			h.ImageSummary = *e
 			h.Repository, h.Tag = tokenRepoTag(tag)
 			imgs = append(imgs, h)
@@ -160,7 +155,7 @@ func writeTemplate(imageS []*entities.ImageSummary, err error) error {
 		}
 	}
 	format := hdr + "{{range . }}" + row + "{{end}}"
-	tmpl := template.Must(template.New("list").Funcs(report.PodmanTemplateFuncs()).Parse(format))
+	tmpl := template.Must(template.New("list").Parse(format))
 	w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0)
 	defer w.Flush()
 	return tmpl.Execute(w, imgs)
@@ -208,7 +203,7 @@ func sortFunc(key string, data []*entities.ImageSummary) func(i, j int) bool {
 
 func imageListFormat(flags listFlagType) (string, string) {
 	if flags.quiet {
-		return "", "{{slice .ID 0 12}}\n"
+		return "", "{{.ID}}\n"
 	}
 
 	// Defaults
@@ -224,15 +219,15 @@ func imageListFormat(flags listFlagType) (string, string) {
 	if flags.noTrunc {
 		row += "\tsha256:{{.ID}}"
 	} else {
-		row += "\t{{slice .ID 0 12}}"
+		row += "\t{{.ID}}"
 	}
 
 	hdr += "\tCREATED\tSIZE"
-	row += "\t{{humanDuration .Created}}\t{{humanSize .Size}}"
+	row += "\t{{.Created}}\t{{.Size}}"
 
 	if flags.history {
 		hdr += "\tHISTORY"
-		row += "\t{{if .History}}{{join .History \", \"}}{{else}}<none>{{end}}"
+		row += "\t{{if .History}}{{.History}}{{else}}<none>{{end}}"
 	}
 
 	if flags.readOnly {
@@ -249,3 +244,30 @@ func imageListFormat(flags listFlagType) (string, string) {
 	row += "\n"
 	return hdr, row
 }
+
+type imageReporter struct {
+	Repository string `json:"repository,omitempty"`
+	Tag        string `json:"tag,omitempty"`
+	entities.ImageSummary
+}
+
+func (i imageReporter) ID() string {
+	if !listFlag.noTrunc && len(i.ImageSummary.ID) >= 12 {
+		return i.ImageSummary.ID[0:12]
+	}
+	return i.ImageSummary.ID
+}
+
+func (i imageReporter) Created() string {
+	return units.HumanDuration(time.Since(time.Unix(i.ImageSummary.Created, 0))) + " ago"
+}
+
+func (i imageReporter) Size() string {
+	s := units.HumanSizeWithPrecision(float64(i.ImageSummary.Size), 3)
+	j := strings.LastIndexFunc(s, unicode.IsNumber)
+	return s[:j+1] + " " + s[j+1:]
+}
+
+func (i imageReporter) History() string {
+	return strings.Join(i.ImageSummary.History, ", ")
+}