output improvements

Author: rjtokenring

internal/ota-api/dto.go

@@ -18,7 +18,6 @@
 package otaapi
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -62,7 +61,7 @@ type (
 	OtaStatusDetail struct {
 		FirmwareSize int64   `json:"firmware_size,omitempty"`
 		MaxRetries   int64   `json:"max_retries,omitempty"`
-		RetryAttempt int64   `json:"retry_attempt,omitempty"`		
+		RetryAttempt int64   `json:"retry_attempt,omitempty"`
 		Ota          Ota     `json:"ota"`
 		Details      []State `json:"details,omitempty"`
 	}
@@ -96,7 +95,7 @@ func (r OtaStatusList) String() string {
 		line := []any{r.DeviceID, r.ID, r.MapStatus(), formatHumanReadableTs(r.StartedAt), formatHumanReadableTs(r.EndedAt)}
 		if hasErrorReason {
 			line = append(line, r.ErrorReason)
-			line = append(line, r.RetryAttempt)
+			line = append(line, strconv.FormatInt(r.RetryAttempt, 10))
 		}
 		t.AddRow(line...)
 	}
@@ -120,7 +119,7 @@ func (r Ota) String() string {
 	hasErrorReason := r.ErrorReason != ""
 
 	if hasErrorReason {
-		t.SetHeader("Device ID", "Ota ID", "Status", "Started At", "Ended At", "Error Reason")
+		t.SetHeader("Device ID", "Ota ID", "Status", "Started At", "Ended At", "Error Reason", "Retry Attempt")
 	} else {
 		t.SetHeader("Device ID", "Ota ID", "Status", "Started At", "Ended At")
 	}
@@ -129,6 +128,7 @@ func (r Ota) String() string {
 	line := []any{r.DeviceID, r.ID, r.MapStatus(), formatHumanReadableTs(r.StartedAt), formatHumanReadableTs(r.EndedAt)}
 	if hasErrorReason {
 		line = append(line, r.ErrorReason)
+		line = append(line, strconv.FormatInt(r.RetryAttempt, 10))
 	}
 	t.AddRow(line...)
 
@@ -147,7 +147,7 @@ func (r OtaStatusDetail) String() string {
 	hasErrorReason := r.Ota.ErrorReason != ""
 
 	if hasErrorReason {
-		t.SetHeader("Device ID", "Ota ID", "Status", "Started At", "Ended At", "Error Reason")
+		t.SetHeader("Device ID", "Ota ID", "Status", "Started At", "Ended At", "Error Reason", "Retry Attempt")
 	} else {
 		t.SetHeader("Device ID", "Ota ID", "Status", "Started At", "Ended At")
 	}
@@ -156,23 +156,41 @@ func (r OtaStatusDetail) String() string {
 	line := []any{r.Ota.DeviceID, r.Ota.ID, r.Ota.MapStatus(), formatHumanReadableTs(r.Ota.StartedAt), formatHumanReadableTs(r.Ota.EndedAt)}
 	if hasErrorReason {
 		line = append(line, r.Ota.ErrorReason)
+		line = append(line, strconv.FormatInt(r.RetryAttempt, 10))
 	}
 	t.AddRow(line...)
 
 	output := t.Render()
 
 	// Add details
+	containsFlashState := false
+	firstTS := ""
 	if len(r.Details) > 0 {
 		t = table.New()
 		t.SetHeader("Time", "Status", "Detail")
 		fwSize := int64(0)
 		if r.FirmwareSize > 0 {
 			fwSize = r.FirmwareSize
 		}
+		for _, s := range r.Details {
+			if upperCaseFirst(s.State) == "Flash" {
+				containsFlashState = true
+			}
+			if firstTS == "" {
+				firstTS = formatHumanReadableTs(s.Timestamp)
+			}
+		}
+		if !containsFlashState && !hasErrorReason {
+			t.AddRow(firstTS, "Flash", "")
+			if fwSize > 0 {
+				t.AddRow(firstTS, "Fetch", formatStateData("fetch", strconv.Itoa(int(fwSize)), fwSize, true))
+			}
+		}
 		for _, s := range r.Details {
 			stateData := formatStateData(s.State, s.StateData, fwSize, hasReachedFlashState(r.Details))
 			t.AddRow(formatHumanReadableTs(s.Timestamp), upperCaseFirst(s.State), stateData)
 		}
+
 		output += "\nDetails:\n" + t.Render()
 	}
 
@@ -192,7 +210,6 @@ func formatStateData(state, data string, firmware_size int64, hasReceivedFlashSt
 	if data == "" || data == "Unknown" {
 		return ""
 	}
-	fmt.Println("State: ", state)
 	if state == "fetch" {
 		// This is the state 'fetch' of OTA progress. This contains a number that represents the number of bytes fetched
 		actualDownloadedData, err := strconv.Atoi(data)