refactored

Author: rjtokenring

command/ota/status.go

@@ -10,15 +10,13 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func formatOutput(wideOutput bool, status any) {
-	if st, ok := status.(otaapi.Ota); ok {
-		if !wideOutput {
-			st.DeviceID = ""
-			st.ErrorReason = ""
-			st.Sha256 = ""
-		}
-		printOut(st, wideOutput)
+func formatOtaByIdOutput(wideOutput bool, st *otaapi.OtaStatusResponse) {
+	if !wideOutput {
+		st.Ota.DeviceID = ""
+		st.Ota.ErrorReason = ""
+		st.Ota.Sha256 = ""
 	}
+	printOut(st, wideOutput)
 }
 
 func formatOutputSlice(wideOutput bool, st []otaapi.Ota) {
@@ -50,13 +48,12 @@ func printOut(res any, wideOutput bool) {
 		}
 	}
 	if outputformat == feedback.Text {
-		if st, ok := res.(otaapi.Ota); ok {
-			if wideOutput {
-				fmt.Println(st.GetWideCSVHeader())
-				fmt.Println(st.ToWideCSV())
-			} else {
-				fmt.Println(st.GetCSVHeader())
-				fmt.Println(st.ToCSV())
+		if st, ok := res.(*otaapi.OtaStatusResponse); ok {
+			fmt.Println(st.Ota.ToText())
+			fmt.Println()
+			fmt.Println("Details:")
+			for i := range st.States {
+				fmt.Println(st.States[i].ToText())
 			}
 		}
 		if st, ok := res.([]otaapi.Ota); ok {
@@ -92,7 +89,7 @@ func PrintOtaStatus(otaid, device, otaidpath string, wideOutput bool, cred *conf
 	} else if otaid != "" {
 		res, err := otapi.GetOtaStatusByOtaID(otaid)
 		if err == nil && res != nil {
-			formatOutput(wideOutput, res.Ota)
+			formatOtaByIdOutput(wideOutput, res)
 		} else if err != nil {
 			return err
 		}

internal/ota-api/dto.go

@@ -62,3 +62,15 @@ func (o Ota) GetCSVHeader() string {
 func (o Ota) ToCSV() string {
 	return fmt.Sprintf("%s,%s,%s,%s", o.ID, o.Status, o.StartedAt, o.EndedAt)
 }
+
+func (o Ota) ToText() string {
+	out := fmt.Sprintf("ID: %s\nStatus: %s\nStartedAt: %s\nEndedAt: %s", o.ID, o.Status, o.StartedAt, o.EndedAt)
+	if o.ErrorReason != "" {
+		out += fmt.Sprintf("\nErrorReason: %s", o.ErrorReason)
+	}
+	return out
+}
+
+func (s State) ToText() string {
+	return fmt.Sprintf("Timestamp: %s, State: %s", s.Timestamp, s.State)
+}