Use the new programming package

Author: matteosuppo

conn.go

@@ -9,6 +9,7 @@ import (
 	"crypto/sha256"
 	"crypto/x509"
 	"encoding/hex"
+	"encoding/json"
 	"encoding/pem"
 	"errors"
 	"io/ioutil"
@@ -124,11 +125,39 @@ func uploadHandler(c *gin.Context) {
 		data.Board = data.Rewrite
 	}
 
-	go programmer.Do(data.Port, data.Board, filePath, data.Commandline, data.Extra, nil)
+	go func() {
+		// Resolve commandline
+		commandline, err := programmer.Resolve(data.Port, data.Board, filePath, data.Commandline, data.Extra, &Tools)
+		if err != nil {
+
+			return
+		}
+
+		// Upload
+		if data.Extra.Network {
+			send(map[string]string{"ProgrammerStatus": "Starting", "Cmd": "Network"})
+			err = programmer.Network(data.Port, data.Board, filePath, commandline, data.Extra.Auth, nil)
+		} else {
+			send(map[string]string{"ProgrammerStatus": "Starting", "Cmd": "Serial"})
+			err = programmer.Serial(data.Port, commandline, data.Extra, nil)
+		}
+
+		// Handle result
+		if err != nil {
+			send(map[string]string{"ProgrammerStatus": "Error", "Msg": err.Error()})
+			return
+		}
+		send(map[string]string{"ProgrammerStatus": "Done", "Flash": "Ok"})
+	}()
 
 	c.String(http.StatusAccepted, "")
 }
 
+func send(args map[string]string) {
+	mapB, _ := json.Marshal(args)
+	h.broadcastSys <- mapB
+}
+
 func verifyCommandLine(input string, signature string) error {
 	sign, _ := hex.DecodeString(signature)
 	block, _ := pem.Decode([]byte(*signatureKey))

hub.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/arduino/arduino-create-agent/programmer"
 	"github.com/kardianos/osext"
 	//"os"
 	"os/exec"
@@ -170,7 +171,7 @@ func checkCmd(m []byte) {
 
 	} else if strings.HasPrefix(sl, "killprogrammer") {
 		// kill the running process (assumes singleton for now)
-		go spHandlerProgramKill()
+		go programmer.Kill()
 
 	} else if strings.HasPrefix(sl, "sendjsonraw") {
 		// will catch sendjsonraw

programmer/programmer.go

@@ -23,27 +23,8 @@ import (
 	"github.com/sfreiberg/simplessh"
 )
 
-type logger interface {
-	Debug(args ...interface{})
-	Info(args ...interface{})
-}
-
-func debug(l logger, args ...interface{}) {
-	if l != nil {
-		l.Debug(args...)
-	}
-}
-
-func info(l logger, args ...interface{}) {
-	if l != nil {
-		l.Info(args...)
-	}
-}
-
-// locater can return the location of a tool in the system
-type locater interface {
-	GetLocation(command string) (string, error)
-}
+// Busy tells wether the programmer is doing something
+var Busy = false
 
 // Auth contains username and password used for a network upload
 type Auth struct {
@@ -111,6 +92,9 @@ func Network(port, board, file, commandline string, auth Auth, l logger) error {
 	return err
 }
 
+// Kill stops any upload process as soon as possible
+func Kill() {}
+
 // Serial performs a serial upload
 func Serial(port, commandline string, extra Extra, l logger) error {
 	// some boards needs to be resetted

programmer/utils.go

@@ -1,5 +1,27 @@
 package programmer
 
+type logger interface {
+	Debug(args ...interface{})
+	Info(args ...interface{})
+}
+
+func debug(l logger, args ...interface{}) {
+	if l != nil {
+		l.Debug(args...)
+	}
+}
+
+func info(l logger, args ...interface{}) {
+	if l != nil {
+		l.Info(args...)
+	}
+}
+
+// locater can return the location of a tool in the system
+type locater interface {
+	GetLocation(command string) (string, error)
+}
+
 // differ returns the first item that differ between the two input slices
 func differ(slice1 []string, slice2 []string) string {
 	m := map[string]int{}

serial.go

@@ -5,12 +5,14 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"regexp"
 	"runtime/debug"
 	"strconv"
 	"strings"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/arduino/arduino-create-agent/programmer"
 )
 
 type writeRequest struct {
@@ -453,7 +455,7 @@ func discoverLoop() {
 
 	go func() {
 		for {
-			if !compiling {
+			if !programmer.Busy {
 				spListDual(false)
 			}
 			time.Sleep(2 * time.Second)