@@ -26,12 +26,12 @@ import (
26
26
27
27
// LoadSketch collects and returns all files composing a sketch
28
28
func LoadSketch (ctx context.Context , req * rpc.LoadSketchRequest ) (* rpc.LoadSketchResponse , error ) {
29
- // TODO: This should be a ToRpc function for the Sketch struct
30
29
sk , err := sketch .New (paths .New (req .GetSketchPath ()))
31
30
if err != nil {
32
31
return nil , & cmderrors.CantOpenSketchError {Cause : err }
33
32
}
34
33
34
+ // TODO: This should be a ToRpc function for the Sketch struct
35
35
otherSketchFiles := make ([]string , sk .OtherSketchFiles .Len ())
36
36
for i , file := range sk .OtherSketchFiles {
37
37
otherSketchFiles [i ] = file .String ()
@@ -57,14 +57,7 @@ func LoadSketch(ctx context.Context, req *rpc.LoadSketchRequest) (*rpc.LoadSketc
57
57
}
58
58
}
59
59
60
- defaultProfileResp := & rpc.SketchProfile {}
61
- defaultProfile , err := sk .GetProfile (sk .Project .DefaultProfile )
62
- if err == nil {
63
- defaultProfileResp .Name = defaultProfile .Name
64
- defaultProfileResp .Fqbn = defaultProfile .FQBN
65
- }
66
-
67
- return & rpc.LoadSketchResponse {
60
+ res := & rpc.LoadSketchResponse {
68
61
MainFile : sk .MainFile .String (),
69
62
LocationPath : sk .FullPath .String (),
70
63
OtherSketchFiles : otherSketchFiles ,
@@ -74,6 +67,9 @@ func LoadSketch(ctx context.Context, req *rpc.LoadSketchRequest) (*rpc.LoadSketc
74
67
DefaultPort : defaultPort ,
75
68
DefaultProtocol : defaultProtocol ,
76
69
Profiles : profiles ,
77
- DefaultProfile : defaultProfileResp ,
78
- }, nil
70
+ }
71
+ if defaultProfile , err := sk .GetProfile (sk .Project .DefaultProfile ); err == nil {
72
+ res .DefaultProfile = defaultProfile .ToRpc ()
73
+ }
74
+ return res , nil
79
75
}
0 commit comments