Render a better install overview table

In order to make it easier to see what gets installed and what size the
package will have, print an DNF like table.

Signed-off-by: Roman Mohr <[email protected]>

Author: rmohr

cmd/BUILD.bazel

@@ -20,6 +20,7 @@ go_library(
     importpath = "github.com/rmohr/bazeldnf/cmd",
     visibility = ["//visibility:private"],
     deps = [
+        "//cmd/template",
         "//pkg/api",
         "//pkg/api/bazeldnf",
         "//pkg/bazel",

cmd/resolve.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"fmt"
+	"os"
 
+	"github.com/rmohr/bazeldnf/cmd/template"
 	"github.com/rmohr/bazeldnf/pkg/api/bazeldnf"
 	"github.com/rmohr/bazeldnf/pkg/reducer"
 	"github.com/rmohr/bazeldnf/pkg/repo"
@@ -65,13 +66,9 @@ func NewResolveCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			fmt.Println("Installing:")
-			fmt.Println(install)
-			fmt.Println(len(install))
-			fmt.Println("Force-ignoring:")
-			fmt.Println(forceIgnored)
-			fmt.Println(len(forceIgnored))
-			logrus.Info("Done.")
+			if err := template.Render(os.Stdout, install, forceIgnored); err != nil {
+				return err
+			}
 			return nil
 		},
 	}

cmd/rpmtree.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"os"
+
+	"github.com/rmohr/bazeldnf/cmd/template"
 	"github.com/rmohr/bazeldnf/pkg/bazel"
 	"github.com/rmohr/bazeldnf/pkg/reducer"
 	"github.com/rmohr/bazeldnf/pkg/repo"
@@ -57,7 +60,7 @@ func NewRpmTreeCmd() *cobra.Command {
 				return err
 			}
 			logrus.Info("Solving.")
-			install, _, _, err := solver.Resolve()
+			install, _, forceIgnored, err := solver.Resolve()
 			if err != nil {
 				return err
 			}
@@ -81,7 +84,9 @@ func NewRpmTreeCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			logrus.Info("Done.")
+			if err := template.Render(os.Stdout, install, forceIgnored); err != nil {
+				return err
+			}
 
 			return nil
 		},

cmd/template/BUILD.bazel

@@ -0,0 +1,9 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "template",
+    srcs = ["install.go"],
+    importpath = "github.com/rmohr/bazeldnf/cmd/template",
+    visibility = ["//visibility:public"],
+    deps = ["//pkg/api"],
+)

cmd/template/install.go

@@ -0,0 +1,68 @@
+package template
+
+import (
+	"fmt"
+	"io"
+	"text/tabwriter"
+
+	"github.com/rmohr/bazeldnf/pkg/api"
+)
+
+func Render(writer io.Writer, installed []*api.Package, forceIgnored []*api.Package) error {
+	totalDownloadSize := 0
+	totalInstallSize := 0
+
+	tabWriter := tabwriter.NewWriter(writer, 0, 8, 1, '\t', 0)
+	if _, err := fmt.Fprintln(tabWriter, "Package\tVersion\tSize\tDownload Size"); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	if _, err := fmt.Fprintln(tabWriter, "Installing:\t\t\t"); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	for _, pkg := range installed {
+		totalInstallSize += pkg.Size.Archive
+		totalDownloadSize += pkg.Size.Package
+		if _, err := fmt.Fprintf(tabWriter, " %v\t%v\t%s\t%s\n", pkg.Name, pkg.Version.String(), toReadableQuantity(pkg.Size.Archive), toReadableQuantity(pkg.Size.Package)); err != nil {
+			return fmt.Errorf("failed to write entry: %v", err)
+		}
+	}
+	if _, err := fmt.Fprintln(tabWriter, "Ignoring:\t\t\t"); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	for _, pkg := range forceIgnored {
+		if _, err := fmt.Fprintf(tabWriter, " %v\t%v\t%s\t%s\n", pkg.Name, pkg.Version.String(), toReadableQuantity(pkg.Size.Archive), toReadableQuantity(pkg.Size.Package)); err != nil {
+			return fmt.Errorf("failed to write entry: %v", err)
+		}
+	}
+	if _, err := fmt.Fprintln(tabWriter, "\t\t\t\nTransaction Summary:\t\t\t"); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	if _, err := fmt.Fprintf(tabWriter, "Installing %d Packages \t\t\t\n", len(installed)); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	if _, err := fmt.Fprintf(tabWriter, "Total download size: %s\t\t\t\n", toReadableQuantity(totalDownloadSize)); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	if _, err := fmt.Fprintf(tabWriter, "Total install size: %s\t\t\t\n", toReadableQuantity(totalInstallSize)); err != nil {
+		return fmt.Errorf("failed to write header: %v", err)
+	}
+	if err := tabWriter.Flush(); err != nil {
+		return fmt.Errorf("failed to flush table: %v", err)
+	}
+	return nil
+}
+
+func toReadableQuantity(bytes int) string {
+	if bytes > 1000*1000*1000 {
+		q := float64(bytes) / 1000 / 1000 / 1000
+		return fmt.Sprintf("%.2f G", q)
+	} else if bytes > 1000*1000 {
+		q := float64(bytes) / 1000 / 1000
+		return fmt.Sprintf("%.2f M", q)
+	} else if bytes > 1000 {
+		q := float64(bytes) / 1000
+		return fmt.Sprintf("%.2f K", q)
+	} else {
+		return fmt.Sprintf("%d", bytes)
+	}
+}

pkg/api/api.go

@@ -233,9 +233,9 @@ type Package struct {
 	} `xml:"time"`
 	Size struct {
 		Text      string `xml:",chardata"`
-		Package   string `xml:"package,attr"`
-		Installed string `xml:"installed,attr"`
-		Archive   string `xml:"archive,attr"`
+		Package   int    `xml:"package,attr"`
+		Installed int    `xml:"installed,attr"`
+		Archive   int    `xml:"archive,attr"`
 	} `xml:"size"`
 	Location Location `xml:"location"`
 	Format   struct {