Better ouput formatting based on format output

Author: rjtokenring

command/ota/readheader.go

@@ -23,22 +23,12 @@ import (
 
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cloud-cli/internal/ota"
-	"gopkg.in/yaml.v3"
 )
 
 type ReadHeaderParams struct {
 	File string
 }
 
-type printableHeader struct {
-	CRC32       uint32
-	MagicNumber uint32
-	BoardType   string
-	FQBN        *string
-	VID         string
-	PID         string
-}
-
 // Encode command is used to encode a firmware OTA
 func ReadHeader(params *ReadHeaderParams) error {
 	_, err := os.Stat(params.File)
@@ -55,15 +45,7 @@ func ReadHeader(params *ReadHeaderParams) error {
 		return fmt.Errorf("file %s does not contains a valid OTA header", params.File)
 	}
 
-	out, _ := yaml.Marshal(printableHeader{
-		CRC32:       header.CRC32,
-		MagicNumber: header.MagicNumber,
-		BoardType:   header.BoardType,
-		FQBN:        header.FQBN,
-		VID:         header.VID,
-		PID:         header.PID,
-	})
-	feedback.Print(string(out))
+	feedback.PrintResult(header)
 
 	return nil
 }

internal/ota/decoder.go

@@ -29,6 +29,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/arduino/arduino-cli/table"
 	"github.com/arduino/arduino-cloud-cli/internal/lzss"
 )
 
@@ -93,6 +94,32 @@ type OtaMetadata struct {
 	OtaSHA256      string // SHA256 of the whole file (header + payload).
 }
 
+func (r OtaMetadata) Data() interface{} {
+	return r
+}
+
+func (r OtaMetadata) String() string {
+	t := table.New()
+
+	t.SetHeader("Entry", "Value")
+
+	t.AddRow([]interface{}{"Length", fmt.Sprintf("%d bytes", r.Length)}...)
+	t.AddRow([]interface{}{"CRC32", fmt.Sprintf("%d", r.CRC32)}...)
+	t.AddRow([]interface{}{"Magic Number", fmt.Sprintf("0x%08X", r.MagicNumber)}...)
+	t.AddRow([]interface{}{"Board Type", r.BoardType}...)
+	if r.FQBN != nil {
+		t.AddRow([]interface{}{"FQBN", *r.FQBN}...)
+	}
+	t.AddRow([]interface{}{"VID", r.VID}...)
+	t.AddRow([]interface{}{"PID", r.PID}...)
+	t.AddRow([]interface{}{"Is Arduino Board", strconv.FormatBool(r.IsArduinoBoard)}...)
+	t.AddRow([]interface{}{"Compressed", strconv.FormatBool(r.Compressed)}...)
+	t.AddRow([]interface{}{"Payload SHA256", r.PayloadSHA256}...)
+	t.AddRow([]interface{}{"OTA SHA256", r.OtaSHA256}...)
+
+	return t.Render()
+}
+
 // Read header starting from the first byte of the file
 func readHeader(file OtaFileReader) ([]byte, error) {
 	bytes := make([]byte, HeaderSize)