Read upload port from sketch.json

Read upload port from sketch.json

Author: manchoz

arduino/sketches/sketches.go

@@ -38,6 +38,24 @@ type Metadata struct {
 type BoardMetadata struct {
 	Fqbn string `json:"fqbn,required"`
 	Name string `json:"name,omitempty"`
+	Port string `json:"port,omitepty"`
+}
+
+// NewSketchBook returns a new SketchBook object
+func NewSketchBook(path *paths.Path) *SketchBook {
+	return &SketchBook{
+		Path: path,
+	}
+}
+
+// NewSketch loads a sketch from the sketchbook
+func (sketchbook *SketchBook) NewSketch(name string) (*Sketch, error) {
+	sketch := &Sketch{
+		FullPath: sketchbook.Path.Join(name),
+		Name:     name,
+	}
+	sketch.ImportMetadata()
+	return sketch, nil
 }
 
 // NewSketchFromPath loads a sketch from the specified path

commands/board/attach.go

@@ -96,6 +96,7 @@ func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskPr
 		sketch.Metadata.CPU = sketches.BoardMetadata{
 			Fqbn: board.FQBN(),
 			Name: board.Name(),
+			Port: deviceURI.String(),
 		}
 	}
 

commands/upload/upload.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -53,6 +54,15 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 
 	// FIXME: make a specification on how a port is specified via command line
 	port := req.GetPort()
+	if port == "" && sketch != nil && sketch.Metadata != nil {
+		deviceURI, err := url.Parse(sketch.Metadata.CPU.Port)
+		if err != nil {
+			return nil, fmt.Errorf("invalid Device URL format: %s", err)
+		}
+		if deviceURI.Scheme == "serial" {
+			port = deviceURI.Host + deviceURI.Path
+		}
+	}
 	if port == "" {
 		return nil, fmt.Errorf("no upload port provided")
 	}