Fix for progress status

Author: rjtokenring

command/ota/status.go

@@ -44,7 +44,7 @@ func PrintOtaStatus(otaid, otaids, device string, cred *config.Credentials, limi
 		res, err := otapi.GetOtaStatusByOtaID(otaid, limit, order)
 		if err == nil && res != nil {
 			feedback.PrintResult(otaapi.OtaStatusDetail{
-				FirmwareSize: res.FirmwareSize,
+				FirmwareSize: res.Ota.FirmwareSize,
 				Ota:          res.Ota,
 				Details:      res.States,
 			})

internal/ota-api/dto.go

@@ -18,6 +18,7 @@
 package otaapi
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -31,22 +32,24 @@ const progressBarMultiplier = 2
 
 type (
 	OtaStatusResponse struct {
-		FirmwareSize *int64  `json:"firmware_size,omitempty"`
-		Ota          Ota     `json:"ota"`
-		States       []State `json:"states,omitempty"`
+		Ota    Ota     `json:"ota"`
+		States []State `json:"states,omitempty"`
 	}
 
 	OtaStatusList struct {
 		Ota []Ota `json:"ota"`
 	}
 
 	Ota struct {
-		ID          string `json:"id,omitempty" yaml:"id,omitempty"`
-		DeviceID    string `json:"device_id,omitempty" yaml:"device_id,omitempty"`
-		Status      string `json:"status" yaml:"status"`
-		StartedAt   string `json:"started_at" yaml:"started_at"`
-		EndedAt     string `json:"ended_at,omitempty" yaml:"ended_at,omitempty"`
-		ErrorReason string `json:"error_reason,omitempty" yaml:"error_reason,omitempty"`
+		ID           string `json:"id,omitempty" yaml:"id,omitempty"`
+		DeviceID     string `json:"device_id,omitempty" yaml:"device_id,omitempty"`
+		Status       string `json:"status" yaml:"status"`
+		StartedAt    string `json:"started_at" yaml:"started_at"`
+		EndedAt      string `json:"ended_at,omitempty" yaml:"ended_at,omitempty"`
+		ErrorReason  string `json:"error_reason,omitempty" yaml:"error_reason,omitempty"`
+		FirmwareSize int64  `json:"firmware_size,omitempty"`
+		MaxRetries   int64  `json:"max_retries,omitempty"`
+		RetryAttempt int64  `json:"retry_attempt,omitempty"`
 	}
 
 	State struct {
@@ -57,7 +60,7 @@ type (
 	}
 
 	OtaStatusDetail struct {
-		FirmwareSize *int64  `json:"firmware_size,omitempty"`
+		FirmwareSize int64   `json:"firmware_size,omitempty"`
 		Ota          Ota     `json:"ota"`
 		Details      []State `json:"details,omitempty"`
 	}
@@ -160,8 +163,8 @@ func (r OtaStatusDetail) String() string {
 		t = table.New()
 		t.SetHeader("Time", "Status", "Detail")
 		fwSize := int64(0)
-		if r.FirmwareSize != nil {
-			fwSize = *r.FirmwareSize
+		if r.FirmwareSize > 0 {
+			fwSize = r.FirmwareSize
 		}
 		for _, s := range r.Details {
 			stateData := formatStateData(s.State, s.StateData, fwSize, hasReachedFlashState(r.Details))
@@ -186,6 +189,7 @@ 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)