Skip to content

Commit d43220c

Browse files
giulio93lucarin91
andauthored
fix: progress sse events should return the name
Co-authored-by: Luca Rinaldi <lucarin@protonmail.com>
1 parent af779c5 commit d43220c

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func startHandler(ctx context.Context, cfg config.Configuration, app app.Arduino
5454
for message := range stream {
5555
switch message.GetType() {
5656
case orchestrator.ProgressType:
57-
fmt.Fprintf(out, "Progress: %.0f%%\n", message.GetProgress().Progress)
57+
fmt.Fprintf(out, "Progress[%s]: %.0f%%\n", message.GetProgress().Name, message.GetProgress().Progress)
5858
case orchestrator.InfoType:
5959
fmt.Fprintln(out, "[INFO]", message.GetData())
6060
case orchestrator.ErrorType:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func stopHandler(ctx context.Context, app app.ArduinoApp) error {
4141
for message := range orchestrator.StopApp(ctx, app) {
4242
switch message.GetType() {
4343
case orchestrator.ProgressType:
44-
fmt.Fprintf(out, "Progress: %.0f%%\n", message.GetProgress().Progress)
44+
fmt.Fprintf(out, "Progress[%s]: %.0f%%\n", message.GetProgress().Name, message.GetProgress().Progress)
4545
case orchestrator.InfoType:
4646
fmt.Fprintln(out, "[INFO]", message.GetData())
4747
case orchestrator.ErrorType:

internal/api/handlers/app_start.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func HandleAppStart(
4848
defer sseStream.Close()
4949

5050
type progress struct {
51+
Name string `json:"name"`
5152
Progress float32 `json:"progress"`
5253
}
5354
type log struct {
@@ -56,7 +57,7 @@ func HandleAppStart(
5657
for item := range orchestrator.StartApp(r.Context(), dockerCli, provisioner, modelsIndex, bricksIndex, app, cfg, staticStore) {
5758
switch item.GetType() {
5859
case orchestrator.ProgressType:
59-
sseStream.Send(render.SSEEvent{Type: "progress", Data: progress{Progress: item.GetProgress().Progress}})
60+
sseStream.Send(render.SSEEvent{Type: "progress", Data: progress(*item.GetProgress())})
6061
case orchestrator.InfoType:
6162
sseStream.Send(render.SSEEvent{Type: "message", Data: log{Message: item.GetData()}})
6263
case orchestrator.ErrorType:

internal/api/handlers/app_stop.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func HandleAppStop(
3939
defer sseStream.Close()
4040

4141
type progress struct {
42+
Name string `json:"name"`
4243
Progress float32 `json:"progress"`
4344
}
4445
type log struct {
@@ -47,7 +48,7 @@ func HandleAppStop(
4748
for item := range orchestrator.StopApp(r.Context(), app) {
4849
switch item.GetType() {
4950
case orchestrator.ProgressType:
50-
sseStream.Send(render.SSEEvent{Type: "progress", Data: progress{Progress: item.GetProgress().Progress}})
51+
sseStream.Send(render.SSEEvent{Type: "progress", Data: progress(*item.GetProgress())})
5152
case orchestrator.InfoType:
5253
sseStream.Send(render.SSEEvent{Type: "message", Data: log{Message: item.GetData()}})
5354
case orchestrator.ErrorType:

0 commit comments

Comments
 (0)