Commit b16ae70

authored

[skip-changelog] gRPC: Added progress callback in CompileServerToStreams adapter (#2623)

1 parent b72f5ca commit b16ae70Copy full SHA for b16ae70

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ import (`
`41`	`41`
`42`	`42`	`// CompilerServerToStreams creates a gRPC CompileServer that sends the responses to the provided streams.`
`43`	`43`	`// The returned callback function can be used to retrieve the builder result after the compilation is done.`
`44`		`-func CompilerServerToStreams(ctx context.Context, stdOut, stderr io.Writer) (server rpc.ArduinoCoreService_CompileServer, resultCB func() *rpc.BuilderResult) {`
	`44`	`+func CompilerServerToStreams(ctx context.Context, stdOut, stderr io.Writer, progressCB rpc.TaskProgressCB) (server rpc.ArduinoCoreService_CompileServer, resultCB func() *rpc.BuilderResult) {`
`45`	`45`	`var builderResult *rpc.BuilderResult`
`46`	`46`	`stream := streamResponseToCallback(ctx, func(resp *rpc.CompileResponse) error {`
`47`	`47`	`if out := resp.GetOutStream(); len(out) > 0 {`
`@@ -57,6 +57,11 @@ func CompilerServerToStreams(ctx context.Context, stdOut, stderr io.Writer) (ser`
`57`	`57`	`if result := resp.GetResult(); result != nil {`
`58`	`58`	`builderResult = result`
`59`	`59`	`}`
	`60`	`+ if progress := resp.GetProgress(); progress != nil {`
	`61`	`+ if progressCB != nil {`
	`62`	`+ progressCB(progress)`
	`63`	`+ }`
	`64`	`+ }`
`60`	`65`	`return nil`
`61`	`66`	`})`
`62`	`67`	`return stream, func() *rpc.BuilderResult { return builderResult }`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ func runCompileCommand(cmd *cobra.Command, args []string, srv rpc.ArduinoCoreSer`
`245`	`245`	`DoNotExpandBuildProperties: showProperties == arguments.ShowPropertiesUnexpanded,`
`246`	`246`	`Jobs: jobs,`
`247`	`247`	`}`
`248`		`- server, builderResCB := commands.CompilerServerToStreams(ctx, stdOut, stdErr)`
	`248`	`+ server, builderResCB := commands.CompilerServerToStreams(ctx, stdOut, stdErr, nil)`
`249`	`249`	`compileError := srv.Compile(compileRequest, server)`
`250`	`250`	`builderRes := builderResCB()`
`251`	`251`

Comments

(0)