finalize progress bar

Author: mirkoCrobu

internal/update/apt/service.go

@@ -78,12 +78,12 @@ func (s *Service) UpgradePackages(ctx context.Context, names []string) (<-chan u
 		return nil, update.ErrOperationAlreadyInProgress
 	}
 	eventsCh := make(chan update.Event, 100)
-
 	go func() {
 		defer s.lock.Unlock()
 		defer close(eventsCh)
 
 		eventsCh <- update.NewDataEvent(update.StartEvent, "Upgrade is starting")
+		eventsCh <- update.NewProgressEvent(0.0)
 		stream := runUpgradeCommand(ctx, names)
 		for line, err := range stream {
 			if err != nil {
@@ -92,14 +92,14 @@ func (s *Service) UpgradePackages(ctx context.Context, names []string) (<-chan u
 			}
 			eventsCh <- update.NewDataEvent(update.UpgradeLineEvent, line)
 		}
-
 		eventsCh <- update.NewDataEvent(update.StartEvent, "apt cleaning cache is starting")
 		eventsCh <- update.NewProgressEvent(80.0)
 		for line, err := range runAptCleanCommand(ctx) {
 			if err != nil {
 				eventsCh <- update.NewErrorEvent(fmt.Errorf("error running apt clean command: %w", err))
 				return
 			}
+
 			eventsCh <- update.NewDataEvent(update.UpgradeLineEvent, line)
 		}
 		eventsCh <- update.NewProgressEvent(85.0)
@@ -130,7 +130,7 @@ func (s *Service) UpgradePackages(ctx context.Context, names []string) (<-chan u
 			eventsCh <- update.NewDataEvent(update.UpgradeLineEvent, line)
 		}
 		eventsCh <- update.NewDataEvent(update.RestartEvent, "Upgrade completed. Restarting ...")
-
+		eventsCh <- update.NewProgressEvent(100.0)
 		err := restartServices(ctx)
 		if err != nil {
 			eventsCh <- update.NewErrorEvent(fmt.Errorf("error restarting services after upgrade: %w", err))

internal/update/arduino/arduino.go

@@ -135,8 +135,8 @@ func (a *ArduinoPlatformUpdater) UpgradePackages(ctx context.Context, names []st
 		defer a.lock.Unlock()
 		defer close(eventsCh)
 
-		const indexWeight float32 = 30.0
 		const indexBase float32 = 0.0
+		const indexWeight float32 = 30.0
 		const upgradeBase float32 = 30.0
 		const upgradeWeight float32 = 60.0
 

internal/update/event.go

@@ -69,8 +69,9 @@ func NewDataEvent(t EventType, data string) Event {
 
 func NewProgressEvent(progress float32) Event {
 	return Event{
-		Type: ProgressEvent,
-		data: fmt.Sprintf("%.2f", progress),
+		Type:     ProgressEvent,
+		data:     fmt.Sprintf("%.2f", progress),
+		Progress: progress,
 	}
 }
 

internal/update/update.go

@@ -148,14 +148,11 @@ func (m *Manager) UpgradePackages(ctx context.Context, pkgs []UpgradablePackage)
 		for e := range arduinoEvents {
 			if e.Type == ProgressEvent {
 				globalProgress := (e.Progress / 100.0) * arduinoWeight
-				fmt.Println("++++++++++++++++++++++++ globalProgress arduinoEvents:", globalProgress)
-				slog.Debug("Arduino upgrade progress", slog.Float64("globalProgress", float64(globalProgress)))
 				m.broadcast(NewProgressEvent(globalProgress))
 			} else {
 				m.broadcast(e)
 			}
 		}
-
 		aptEvents, err := m.debUpdateService.UpgradePackages(ctx, debPkgs)
 		if err != nil {
 			m.broadcast(NewErrorEvent(fmt.Errorf("failed to upgrade APT packages: %w", err)))
@@ -164,14 +161,12 @@ func (m *Manager) UpgradePackages(ctx context.Context, pkgs []UpgradablePackage)
 		for e := range aptEvents {
 			if e.Type == ProgressEvent {
 				globalProgress := arduinoWeight + (e.Progress/100.0)*aptWeight
-				fmt.Println("++++++++++++++++++++++++ globalProgress APT:", globalProgress)
-				slog.Debug("APT upgrade progress", slog.Float64("globalProgress", float64(globalProgress)))
 				m.broadcast(NewProgressEvent(globalProgress))
 			} else {
 				m.broadcast(e)
 			}
 		}
-
+		m.broadcast(NewProgressEvent(100.0))
 		m.broadcast(NewDataEvent(DoneEvent, "Update completed"))
 	}()
 	return nil