fix code review

Author: mirkoCrobu

cmd/arduino-app-cli/system/system.go

@@ -113,11 +113,14 @@ func newUpdateCmd() *cobra.Command {
 
 			events := updater.Subscribe()
 			for event := range events {
-				if event.Type == update.ErrorEvent {
+				switch event.Type {
+				case update.ErrorEvent:
 					// TODO: add colors to error messages
 					err := event.GetError()
 					feedback.Printf("Error: %s [%s]", err.Error(), update.GetUpdateErrorCode(err))
-				} else {
+				case update.ProgressEvent:
+					feedback.Printf("[%s] %.2f", event.Type.String(), event.GetProgress())
+				default:
 					feedback.Printf("[%s] %s", event.Type.String(), event.GetData())
 				}
 

internal/api/handlers/update.go

@@ -152,7 +152,8 @@ func HandleUpdateEvents(updater *update.Manager) http.HandlerFunc {
 					slog.Info("APT event channel closed, stopping SSE stream")
 					return
 				}
-				if event.Type == update.ErrorEvent {
+				switch event.Type {
+				case update.ErrorEvent:
 					err := event.GetError()
 					code := render.InternalServiceErr
 					if c := update.GetUpdateErrorCode(err); c != update.UnknownErrorCode {
@@ -162,7 +163,12 @@ func HandleUpdateEvents(updater *update.Manager) http.HandlerFunc {
 						Code:    code,
 						Message: err.Error(),
 					})
-				} else {
+				case update.ProgressEvent:
+					sseStream.Send(render.SSEEvent{
+						Type: event.Type.String(),
+						Data: event.GetProgress(),
+					})
+				default:
 					sseStream.Send(render.SSEEvent{
 						Type: event.Type.String(),
 						Data: event.GetData(),

internal/update/event.go

@@ -16,8 +16,6 @@
 package update
 
 import (
-	"fmt"
-
 	"go.bug.st/f"
 )
 
@@ -36,7 +34,7 @@ const (
 // Event represents a single event in the upgrade process.
 type Event struct {
 	Type     EventType
-	Progress float32
+	progress float32
 	data     string
 	err      error // error field for error events
 }
@@ -70,8 +68,7 @@ func NewDataEvent(t EventType, data string) Event {
 func NewProgressEvent(progress float32) Event {
 	return Event{
 		Type:     ProgressEvent,
-		data:     fmt.Sprintf("%.2f", progress),
-		Progress: progress,
+		progress: progress,
 	}
 }
 
@@ -92,6 +89,11 @@ func (e Event) GetError() error {
 	return e.err
 }
 
+func (e Event) GetProgress() float32 {
+	f.Assert(e.Type == ProgressEvent, "not a progress event")
+	return e.progress
+}
+
 type PackageType string
 
 const (

internal/update/update.go

@@ -147,7 +147,7 @@ func (m *Manager) UpgradePackages(ctx context.Context, pkgs []UpgradablePackage)
 		}
 		for e := range arduinoEvents {
 			if e.Type == ProgressEvent {
-				globalProgress := (e.Progress / 100.0) * arduinoWeight
+				globalProgress := (e.progress / 100.0) * arduinoWeight
 				m.broadcast(NewProgressEvent(globalProgress))
 			} else {
 				m.broadcast(e)
@@ -160,7 +160,7 @@ func (m *Manager) UpgradePackages(ctx context.Context, pkgs []UpgradablePackage)
 		}
 		for e := range aptEvents {
 			if e.Type == ProgressEvent {
-				globalProgress := arduinoWeight + (e.Progress/100.0)*aptWeight
+				globalProgress := arduinoWeight + (e.progress/100.0)*aptWeight
 				m.broadcast(NewProgressEvent(globalProgress))
 			} else {
 				m.broadcast(e)