handling Unknown state data

Author: rjtokenring

internal/ota-api/dto.go

@@ -177,21 +177,27 @@ func hasReachedFlashState(states []State) bool {
 }
 
 func formatStateData(state, data string, firmware_size *int64, hasReceivedFlashState bool) string {
-	if data == "" || strings.ToLower(data) == "unknown" {
+	if data == "" {
 		return ""
 	}
 	if state == "fetch" {
-		// This is the state 'fetch' of OTA progress. This contains a numer that represents the number of bytes fetched
+		// 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" {
+			return ""
+		}
 		actualDownloadedData, err := strconv.Atoi(data)
 		if err != nil || firmware_size == nil || actualDownloadedData <= 0 || *firmware_size <= 0 { // Sanitize and avoid division by zero
 			return data
 		}
 		percentage := (float64(actualDownloadedData) / float64(*firmware_size)) * 100
 		return buildSimpleProgressBar(percentage)
 	}
+	if strings.ToLower(data) == "unknown" {
+		return ""
+	}
 	return data
 }
 

internal/ota-api/dto_test.go

@@ -17,3 +17,9 @@ func TestProgressBar_ifFlashState_goTo100Pct(t *testing.T) {
 	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)
+}