Skip to content

Commit 9061584

Browse files
Massimiliano Pippimastrolinux
Massimiliano Pippi
authored and
mastrolinux
committed
Fix update index on fresh installs (arduino#530)
* remove error checking on unused proto field, added deprecation comment * fix typo in function name * do not os.exit in library code * create data dir tree if it doesnt exist
1 parent d05a742 commit 9061584

24 files changed

+231
-142
lines changed

‎cli/board/attach.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ var attachFlags struct {
5353
}
5454

5555
func runAttachCommand(cmd *cobra.Command, args []string) {
56-
instance := instance.CreateInstance()
56+
instance, err := instance.CreateInstance()
57+
if err != nil {
58+
feedback.Errorf("Attach board error: %v", err)
59+
os.Exit(errorcodes.ErrGeneric)
60+
}
5761

5862
var path *paths.Path
5963
if len(args) > 1 {
@@ -62,13 +66,12 @@ func runAttachCommand(cmd *cobra.Command, args []string) {
6266
path = initSketchPath(path)
6367
}
6468

65-
_, err := board.Attach(context.Background(), &rpc.BoardAttachReq{
69+
if _, err = board.Attach(context.Background(), &rpc.BoardAttachReq{
6670
Instance: instance,
6771
BoardUri: args[0],
6872
SketchPath: path.String(),
6973
SearchTimeout: attachFlags.searchTimeout,
70-
}, output.TaskProgress())
71-
if err != nil {
74+
}, output.TaskProgress()); err != nil {
7275
feedback.Errorf("Attach board error: %v", err)
7376
os.Exit(errorcodes.ErrGeneric)
7477
}

‎cli/board/details.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,14 @@ var detailsCommand = &cobra.Command{
4141
}
4242

4343
func runDetailsCommand(cmd *cobra.Command, args []string) {
44+
inst, err := instance.CreateInstance()
45+
if err != nil {
46+
feedback.Errorf("Error getting board details: %v", err)
47+
os.Exit(errorcodes.ErrGeneric)
48+
}
49+
4450
res, err := board.Details(context.Background(), &rpc.BoardDetailsReq{
45-
Instance: instance.CreateInstance(),
51+
Instance: inst,
4652
Fqbn: args[0],
4753
})
4854

‎cli/board/list.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ func runListCommand(cmd *cobra.Command, args []string) {
6161
time.Sleep(timeout)
6262
}
6363

64-
ports, err := board.List(instance.CreateInstance().GetId())
64+
inst, err := instance.CreateInstance()
65+
if err != nil {
66+
feedback.Errorf("Error detecting boards: %v", err)
67+
os.Exit(errorcodes.ErrGeneric)
68+
}
69+
70+
ports, err := board.List(inst.GetId())
6571
if err != nil {
6672
feedback.Errorf("Error detecting boards: %v", err)
6773
os.Exit(errorcodes.ErrNetwork)

‎cli/board/listall.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,14 @@ var listAllCommand = &cobra.Command{
4646

4747
// runListAllCommand list all installed boards
4848
func runListAllCommand(cmd *cobra.Command, args []string) {
49-
instance := instance.CreateInstance()
49+
inst, err := instance.CreateInstance()
50+
if err != nil {
51+
feedback.Errorf("Error listing boards: %v", err)
52+
os.Exit(errorcodes.ErrGeneric)
53+
}
5054

5155
list, err := board.ListAll(context.Background(), &rpc.BoardListAllReq{
52-
Instance: instance,
56+
Instance: inst,
5357
SearchArgs: args,
5458
})
5559
if err != nil {

‎cli/compile/compile.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ func NewCommand() *cobra.Command {
8686
}
8787

8888
func run(cmd *cobra.Command, args []string) {
89-
instance := instance.CreateInstance()
89+
inst, err := instance.CreateInstance()
90+
if err != nil {
91+
feedback.Errorf("Error during build: %v", err)
92+
os.Exit(errorcodes.ErrGeneric)
93+
}
9094

9195
var path *paths.Path
9296
if len(args) > 0 {
@@ -95,8 +99,8 @@ func run(cmd *cobra.Command, args []string) {
9599

96100
sketchPath := initSketchPath(path)
97101

98-
_, err := compile.Compile(context.Background(), &rpc.CompileReq{
99-
Instance: instance,
102+
_, err = compile.Compile(context.Background(), &rpc.CompileReq{
103+
Instance: inst,
100104
Fqbn: fqbn,
101105
SketchPath: sketchPath.String(),
102106
ShowProperties: showProperties,
@@ -118,7 +122,7 @@ func run(cmd *cobra.Command, args []string) {
118122

119123
if uploadAfterCompile {
120124
_, err := upload.Upload(context.Background(), &rpc.UploadReq{
121-
Instance: instance,
125+
Instance: inst,
122126
Fqbn: fqbn,
123127
SketchPath: sketchPath.String(),
124128
Port: port,

‎cli/core/download.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ func initDownloadCommand() *cobra.Command {
4747
}
4848

4949
func runDownloadCommand(cmd *cobra.Command, args []string) {
50-
instance := instance.CreateInstance()
50+
inst, err := instance.CreateInstance()
51+
if err != nil {
52+
feedback.Errorf("Error downloading: %v", err)
53+
os.Exit(errorcodes.ErrGeneric)
54+
}
55+
5156
logrus.Info("Executing `arduino core download`")
5257

5358
platformsRefs, err := globals.ParseReferenceArgs(args, true)
@@ -58,7 +63,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
5863

5964
for i, platformRef := range platformsRefs {
6065
platformDownloadreq := &rpc.PlatformDownloadReq{
61-
Instance: instance,
66+
Instance: inst,
6267
PlatformPackage: platformRef.PackageName,
6368
Architecture: platformRef.Architecture,
6469
Version: platformRef.Version,

‎cli/core/install.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ func initInstallCommand() *cobra.Command {
4848
}
4949

5050
func runInstallCommand(cmd *cobra.Command, args []string) {
51-
instance := instance.CreateInstance()
51+
inst, err := instance.CreateInstance()
52+
if err != nil {
53+
feedback.Errorf("Error installing: %v", err)
54+
os.Exit(errorcodes.ErrGeneric)
55+
}
56+
5257
logrus.Info("Executing `arduino core install`")
5358

5459
platformsRefs, err := globals.ParseReferenceArgs(args, true)
@@ -59,7 +64,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
5964

6065
for _, platformRef := range platformsRefs {
6166
plattformInstallReq := &rpc.PlatformInstallReq{
62-
Instance: instance,
67+
Instance: inst,
6368
PlatformPackage: platformRef.PackageName,
6469
Architecture: platformRef.Architecture,
6570
Version: platformRef.Version,

‎cli/core/list.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,15 @@ var listFlags struct {
4949
}
5050

5151
func runListCommand(cmd *cobra.Command, args []string) {
52-
instance := instance.CreateInstance()
52+
inst, err := instance.CreateInstance()
53+
if err != nil {
54+
feedback.Errorf("Error listing platforms: %v", err)
55+
os.Exit(errorcodes.ErrGeneric)
56+
}
57+
5358
logrus.Info("Executing `arduino core list`")
5459

55-
platforms, err := core.GetPlatforms(instance.Id, listFlags.updatableOnly)
60+
platforms, err := core.GetPlatforms(inst.Id, listFlags.updatableOnly)
5661
if err != nil {
5762
feedback.Errorf("Error listing platforms: %v", err)
5863
os.Exit(errorcodes.ErrGeneric)

‎cli/core/search.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,16 @@ func initSearchCommand() *cobra.Command {
5151
}
5252

5353
func runSearchCommand(cmd *cobra.Command, args []string) {
54-
instance := instance.CreateInstance()
54+
inst, err := instance.CreateInstance()
55+
if err != nil {
56+
feedback.Errorf("Error saerching for platforms: %v", err)
57+
os.Exit(errorcodes.ErrGeneric)
58+
}
59+
5560
logrus.Info("Executing `arduino core search`")
5661

5762
arguments := strings.ToLower(strings.Join(args, " "))
58-
resp, err := core.PlatformSearch(instance.GetId(), arguments, allVersions)
63+
resp, err := core.PlatformSearch(inst.GetId(), arguments, allVersions)
5964
if err != nil {
6065
feedback.Errorf("Error saerching for platforms: %v", err)
6166
os.Exit(errorcodes.ErrGeneric)

‎cli/core/uninstall.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ func initUninstallCommand() *cobra.Command {
4444
}
4545

4646
func runUninstallCommand(cmd *cobra.Command, args []string) {
47-
instance := instance.CreateInstance()
47+
inst, err := instance.CreateInstance()
48+
if err != nil {
49+
feedback.Errorf("Error uninstalling: %v", err)
50+
os.Exit(errorcodes.ErrGeneric)
51+
}
52+
4853
logrus.Info("Executing `arduino core uninstall`")
4954

5055
platformsRefs, err := globals.ParseReferenceArgs(args, true)
@@ -61,7 +66,7 @@ func runUninstallCommand(cmd *cobra.Command, args []string) {
6166
}
6267
for _, platformRef := range platformsRefs {
6368
_, err := core.PlatformUninstall(context.Background(), &rpc.PlatformUninstallReq{
64-
Instance: instance,
69+
Instance: inst,
6570
PlatformPackage: platformRef.PackageName,
6671
Architecture: platformRef.Architecture,
6772
}, output.NewTaskProgressCB())

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy