@@ -24,52 +24,11 @@ import (
24
24
paths "github.com/arduino/go-paths-helper"
25
25
)
26
26
27
- // LoadSketch collects and returns all files composing a sketch
27
+ // LoadSketch collects and returns all information about a sketch
28
28
func LoadSketch (ctx context.Context , req * rpc.LoadSketchRequest ) (* rpc.LoadSketchResponse , error ) {
29
29
sk , err := sketch .New (paths .New (req .GetSketchPath ()))
30
30
if err != nil {
31
31
return nil , & cmderrors.CantOpenSketchError {Cause : err }
32
32
}
33
-
34
- // TODO: This should be a ToRpc function for the Sketch struct
35
- otherSketchFiles := make ([]string , sk .OtherSketchFiles .Len ())
36
- for i , file := range sk .OtherSketchFiles {
37
- otherSketchFiles [i ] = file .String ()
38
- }
39
-
40
- additionalFiles := make ([]string , sk .AdditionalFiles .Len ())
41
- for i , file := range sk .AdditionalFiles {
42
- additionalFiles [i ] = file .String ()
43
- }
44
-
45
- rootFolderFiles := make ([]string , sk .RootFolderFiles .Len ())
46
- for i , file := range sk .RootFolderFiles {
47
- rootFolderFiles [i ] = file .String ()
48
- }
49
-
50
- defaultPort , defaultProtocol := sk .GetDefaultPortAddressAndProtocol ()
51
-
52
- profiles := make ([](* rpc.SketchProfile ), len (sk .Project .Profiles ))
53
- for i , profile := range sk .Project .Profiles {
54
- profiles [i ] = & rpc.SketchProfile {
55
- Name : profile .Name ,
56
- Fqbn : profile .FQBN ,
57
- }
58
- }
59
-
60
- res := & rpc.LoadSketchResponse {
61
- MainFile : sk .MainFile .String (),
62
- LocationPath : sk .FullPath .String (),
63
- OtherSketchFiles : otherSketchFiles ,
64
- AdditionalFiles : additionalFiles ,
65
- RootFolderFiles : rootFolderFiles ,
66
- DefaultFqbn : sk .GetDefaultFQBN (),
67
- DefaultPort : defaultPort ,
68
- DefaultProtocol : defaultProtocol ,
69
- Profiles : profiles ,
70
- }
71
- if defaultProfile , err := sk .GetProfile (sk .Project .DefaultProfile ); err == nil {
72
- res .DefaultProfile = defaultProfile .ToRpc ()
73
- }
74
- return res , nil
33
+ return sk .ToRpc (), nil
75
34
}
0 commit comments