Commit 1230f69

committed

fix code review

1 parent 7363394 commit 1230f69Copy full SHA for 1230f69

File tree

+22

-11

lines changed

+22

-11

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,14 @@ func newUpdateCmd() *cobra.Command {`
`113`	`113`
`114`	`114`	`events := updater.Subscribe()`
`115`	`115`	`for event := range events {`
`116`		`- if event.Type == update.ErrorEvent {`
	`116`	`+ switch event.Type {`
	`117`	`+ case update.ErrorEvent:`
`117`	`118`	`// TODO: add colors to error messages`
`118`	`119`	`err := event.GetError()`
`119`	`120`	`feedback.Printf("Error: %s [%s]", err.Error(), update.GetUpdateErrorCode(err))`
`120`		`- } else {`
	`121`	`+ case update.ProgressEvent:`
	`122`	`+ feedback.Printf("[%s] %.2f", event.Type.String(), event.GetProgress())`
	`123`	`+ default:`
`121`	`124`	`feedback.Printf("[%s] %s", event.Type.String(), event.GetData())`
`122`	`125`	`}`
`123`	`126`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ func HandleUpdateEvents(updater *update.Manager) http.HandlerFunc {`
`152`	`152`	`slog.Info("APT event channel closed, stopping SSE stream")`
`153`	`153`	`return`
`154`	`154`	`}`
`155`		`- if event.Type == update.ErrorEvent {`
	`155`	`+ switch event.Type {`
	`156`	`+ case update.ErrorEvent:`
`156`	`157`	`err := event.GetError()`
`157`	`158`	`code := render.InternalServiceErr`
`158`	`159`	`if c := update.GetUpdateErrorCode(err); c != update.UnknownErrorCode {`
`@@ -162,7 +163,12 @@ func HandleUpdateEvents(updater *update.Manager) http.HandlerFunc {`
`162`	`163`	`Code: code,`
`163`	`164`	`Message: err.Error(),`
`164`	`165`	`})`
`165`		`- } else {`
	`166`	`+ case update.ProgressEvent:`
	`167`	`+ sseStream.Send(render.SSEEvent{`
	`168`	`+ Type: event.Type.String(),`
	`169`	`+ Data: event.GetProgress(),`
	`170`	`+ })`
	`171`	`+ default:`
`166`	`172`	`sseStream.Send(render.SSEEvent{`
`167`	`173`	`Type: event.Type.String(),`
`168`	`174`	`Data: event.GetData(),`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`package update`
`17`	`17`
`18`	`18`	`import (`
`19`		`- "fmt"`
`20`		`-`
`21`	`19`	`"go.bug.st/f"`
`22`	`20`	`)`
`23`	`21`
`@@ -36,7 +34,7 @@ const (`
`36`	`34`	`// Event represents a single event in the upgrade process.`
`37`	`35`	`type Event struct {`
`38`	`36`	`Type EventType`
`39`		`- Progress float32`
	`37`	`+ progress float32`
`40`	`38`	`data string`
`41`	`39`	`err error // error field for error events`
`42`	`40`	`}`
`@@ -70,8 +68,7 @@ func NewDataEvent(t EventType, data string) Event {`
`70`	`68`	`func NewProgressEvent(progress float32) Event {`
`71`	`69`	`return Event{`
`72`	`70`	`Type: ProgressEvent,`
`73`		`- data: fmt.Sprintf("%.2f", progress),`
`74`		`- Progress: progress,`
	`71`	`+ progress: progress,`
`75`	`72`	`}`
`76`	`73`	`}`
`77`	`74`
`@@ -92,6 +89,11 @@ func (e Event) GetError() error {`
`92`	`89`	`return e.err`
`93`	`90`	`}`
`94`	`91`
	`92`	`+func (e Event) GetProgress() float32 {`
	`93`	`+ f.Assert(e.Type == ProgressEvent, "not a progress event")`
	`94`	`+ return e.progress`
	`95`	`+}`
	`96`	`+`
`95`	`97`	`type PackageType string`
`96`	`98`
`97`	`99`	`const (`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func (m *Manager) UpgradePackages(ctx context.Context, pkgs []UpgradablePackage)`
`147`	`147`	`}`
`148`	`148`	`for e := range arduinoEvents {`
`149`	`149`	`if e.Type == ProgressEvent {`
`150`		`- globalProgress := (e.Progress / 100.0) * arduinoWeight`
	`150`	`+ globalProgress := (e.progress / 100.0) * arduinoWeight`
`151`	`151`	`m.broadcast(NewProgressEvent(globalProgress))`
`152`	`152`	`} else {`
`153`	`153`	`m.broadcast(e)`
`@@ -160,7 +160,7 @@ func (m *Manager) UpgradePackages(ctx context.Context, pkgs []UpgradablePackage)`
`160`	`160`	`}`
`161`	`161`	`for e := range aptEvents {`
`162`	`162`	`if e.Type == ProgressEvent {`
`163`		`- globalProgress := arduinoWeight + (e.Progress/100.0)*aptWeight`
	`163`	`+ globalProgress := arduinoWeight + (e.progress/100.0)*aptWeight`
`164`	`164`	`m.broadcast(NewProgressEvent(globalProgress))`
`165`	`165`	`} else {`
`166`	`166`	`m.broadcast(e)`

Comments

(0)