Skip to content

Commit 063ca1c

Browse files
committed
Removed some accesses to sketch.Sketch
The required information are returned from LoadSketch.
1 parent 0d38852 commit 063ca1c

File tree

5 files changed

+356
-307
lines changed

5 files changed

+356
-307
lines changed

Diff for: commands/sketch/load.go

+4
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,15 @@ func LoadSketch(ctx context.Context, req *rpc.LoadSketchRequest) (*rpc.LoadSketc
4747
rootFolderFiles[i] = file.String()
4848
}
4949

50+
defaultPort, defaultProtocol := sk.GetDefaultPortAddressAndProtocol()
5051
return &rpc.LoadSketchResponse{
5152
MainFile: sk.MainFile.String(),
5253
LocationPath: sk.FullPath.String(),
5354
OtherSketchFiles: otherSketchFiles,
5455
AdditionalFiles: additionalFiles,
5556
RootFolderFiles: rootFolderFiles,
57+
DefaultFqbn: sk.GetDefaultFQBN(),
58+
DefaultPort: defaultPort,
59+
DefaultProtocol: defaultProtocol,
5660
}, nil
5761
}

Diff for: internal/cli/compile/compile.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2929
"github.com/arduino/arduino-cli/commands"
3030
"github.com/arduino/arduino-cli/commands/compile"
31+
"github.com/arduino/arduino-cli/commands/sketch"
3132
"github.com/arduino/arduino-cli/commands/upload"
3233
"github.com/arduino/arduino-cli/configuration"
3334
"github.com/arduino/arduino-cli/i18n"
@@ -163,10 +164,11 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
163164
fqbnArg.Set(profile.GetFqbn())
164165
}
165166

166-
sk := arguments.NewSketch(sketchPath)
167-
defaultFQBN := sk.GetDefaultFQBN()
168-
defaultAddress, defaultProtocol := sk.GetDefaultPortAddressAndProtocol()
169-
fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, inst, defaultFQBN, defaultAddress, defaultProtocol)
167+
sk, err := sketch.LoadSketch(context.Background(), &rpc.LoadSketchRequest{SketchPath: sketchPath.String()})
168+
if err != nil {
169+
feedback.FatalError(err, feedback.ErrGeneric)
170+
}
171+
fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, inst, sk.GetDefaultFqbn(), sk.GetDefaultPort(), sk.GetDefaultProtocol())
170172

171173
if keysKeychain != "" || signKey != "" || encryptKey != "" {
172174
arguments.CheckFlagsMandatory(cmd, "keys-keychain", "sign-key", "encrypt-key")

Diff for: internal/cli/debug/debug.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ import (
2222
"sort"
2323

2424
"github.com/arduino/arduino-cli/commands/debug"
25+
"github.com/arduino/arduino-cli/commands/sketch"
2526
"github.com/arduino/arduino-cli/i18n"
2627
"github.com/arduino/arduino-cli/internal/cli/arguments"
2728
"github.com/arduino/arduino-cli/internal/cli/feedback"
2829
"github.com/arduino/arduino-cli/internal/cli/instance"
30+
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2931
dbg "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/debug/v1"
3032
"github.com/arduino/arduino-cli/table"
3133
"github.com/arduino/go-properties-orderedmap"
@@ -75,10 +77,11 @@ func runDebugCommand(command *cobra.Command, args []string) {
7577
}
7678

7779
sketchPath := arguments.InitSketchPath(path)
78-
sk := arguments.NewSketch(sketchPath)
79-
defaultFQBN := sk.GetDefaultFQBN()
80-
defatulAddress, degaultProtocol := sk.GetDefaultPortAddressAndProtocol()
81-
fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, instance, defaultFQBN, defatulAddress, degaultProtocol)
80+
sk, err := sketch.LoadSketch(context.Background(), &rpc.LoadSketchRequest{SketchPath: sketchPath.String()})
81+
if err != nil {
82+
feedback.FatalError(err, feedback.ErrGeneric)
83+
}
84+
fqbn, port := arguments.CalculateFQBNAndPort(&portArgs, &fqbnArg, instance, sk.GetDefaultFqbn(), sk.GetDefaultPort(), sk.GetDefaultProtocol())
8285
debugConfigRequested := &dbg.DebugConfigRequest{
8386
Instance: instance,
8487
Fqbn: fqbn,

0 commit comments

Comments
 (0)