addressed comments

Author: rjtokenring

internal/ota-api/dto.go

@@ -27,6 +27,8 @@ import (
 	"github.com/arduino/arduino-cli/table"
 )
 
+const progressBarMultiplier = 2
+
 type (
 	OtaStatusResponse struct {
 		FirmwareSize *int64  `json:"firmware_size,omitempty"`
@@ -157,8 +159,12 @@ func (r OtaStatusDetail) String() string {
 	if len(r.Details) > 0 {
 		t = table.New()
 		t.SetHeader("Time", "Status", "Detail")
+		fwSize := int64(0)
+		if r.FirmwareSize != nil {
+			fwSize = *r.FirmwareSize
+		}
 		for _, s := range r.Details {
-			stateData := formatStateData(s.State, s.StateData, r.FirmwareSize, hasReachedFlashState(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()
@@ -169,45 +175,50 @@ func (r OtaStatusDetail) String() string {
 
 func hasReachedFlashState(states []State) bool {
 	for _, s := range states {
-		if s.State == "flash" {
+		if s.State == "flash" || s.State == "reboot" {
 			return true
 		}
 	}
 	return false
 }
 
-func formatStateData(state, data string, firmware_size *int64, hasReceivedFlashState bool) string {
+func formatStateData(state, data string, firmware_size int64, hasReceivedFlashState bool) string {
 	if data == "" {
 		return ""
 	}
 	if state == "fetch" {
 		// This is the state 'fetch' of OTA progress. This contains a number that represents the number of bytes fetched
-		if hasReceivedFlashState {
-			return buildSimpleProgressBar(float64(100))
-		}
-		if strings.ToLower(data) == "unknown" {
+		if data == "Unknown" {
 			return ""
 		}
 		actualDownloadedData, err := strconv.Atoi(data)
-		if err != nil || firmware_size == nil || actualDownloadedData <= 0 || *firmware_size <= 0 { // Sanitize and avoid division by zero
+		if err != nil || actualDownloadedData <= 0 || firmware_size <= 0 { // Sanitize and avoid division by zero
 			return data
 		}
-		percentage := (float64(actualDownloadedData) / float64(*firmware_size)) * 100
+		if hasReceivedFlashState {
+			return buildSimpleProgressBar(float64(100))
+		}
+		percentage := (float64(actualDownloadedData) / float64(firmware_size)) * 100
 		return buildSimpleProgressBar(percentage)
 	}
-	if strings.ToLower(data) == "unknown" {
+	if data == "Unknown" {
 		return ""
 	}
 	return data
 }
 
 func buildSimpleProgressBar(progress float64) string {
 	progressInt := int(progress) / 10
-	bar := "["
-	bar = bar + strings.Repeat("=", progressInt)
-	bar = bar + strings.Repeat(" ", 10-progressInt)
-	bar = bar + "] " + strconv.FormatFloat(progress, 'f', 2, 64) + "%"
-	return bar
+	progressInt = progressInt * progressBarMultiplier
+	maxProgress := 10 * progressBarMultiplier
+	var bar strings.Builder
+	bar.WriteString("[")
+	bar.WriteString(strings.Repeat("=", progressInt))
+	bar.WriteString(strings.Repeat(" ", maxProgress-progressInt))
+	bar.WriteString("] ")
+	bar.WriteString(strconv.FormatFloat(progress, 'f', 2, 64))
+	bar.WriteString("%")
+	return bar.String()
 }
 
 func upperCaseFirst(s string) string {

internal/ota-api/dto_test.go

@@ -8,18 +8,12 @@ import (
 
 func TestProgressBar_notCompletePct(t *testing.T) {
 	firmwareSize := int64(25665 * 2)
-	bar := formatStateData("fetch", "25665", &firmwareSize, false)
-	assert.Equal(t, "[=====     ] 50.00%", bar)
+	bar := formatStateData("fetch", "25665", firmwareSize, false)
+	assert.Equal(t, "[==========          ] 50.00%", bar)
 }
 
 func TestProgressBar_ifFlashState_goTo100Pct(t *testing.T) {
 	firmwareSize := int64(25665 * 2)
-	bar := formatStateData("fetch", "25665", &firmwareSize, true) // If in flash status, go to 100%
-	assert.Equal(t, "[==========] 100.00%", bar)
-}
-
-func TestProgressBar_ifFlashStateAndUnknown_goTo100Pct(t *testing.T) {
-	firmwareSize := int64(25665 * 2)
-	bar := formatStateData("fetch", "Unknown", &firmwareSize, true) // If in flash status, go to 100%
-	assert.Equal(t, "[==========] 100.00%", bar)
+	bar := formatStateData("fetch", "25665", firmwareSize, true) // If in flash status, go to 100%
+	assert.Equal(t, "[====================] 100.00%", bar)
 }