rework programmer command

Author: facchinm

conn.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/googollee/go-socket.io"
 	"net/http"
+	"strconv"
 )
 
 type connection struct {
@@ -46,9 +47,24 @@ func uploadHandler(c *gin.Context) {
 	board := c.PostForm("board")
 	if board == "" {
 		c.String(http.StatusBadRequest, "board is required")
+		log.Error("board is required")
 		return
 	}
 	board_rewrite := c.PostForm("board_rewrite")
+
+	var authdata basicAuthData
+
+	authdata.UserName = c.PostForm("auth_user")
+	authdata.Password = c.PostForm("auth_pass")
+	commandline := c.PostForm("commandline")
+	networkPort, _ := strconv.ParseBool(c.PostForm("network"))
+
+	if networkPort == false && commandline == "" {
+		c.String(http.StatusBadRequest, "commandline is required for local board")
+		log.Error("commandline is required for local board")
+		return
+	}
+
 	sketch, header, err := c.Request.FormFile("sketch_hex")
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
@@ -60,7 +76,7 @@ func uploadHandler(c *gin.Context) {
 			c.String(http.StatusBadRequest, err.Error())
 		}
 
-		go spProgramRW(port, board, board_rewrite, path)
+		go spProgramRW(port, board, board_rewrite, path, commandline, networkPort, authdata)
 	}
 }
 

download.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 )
 
@@ -83,3 +84,17 @@ func downloadFromUrl(url string) (filename string, err error) {
 
 	return fileName, nil
 }
+
+func spDownloadTool(name string, url string) {
+	fileName, err := downloadFromUrl(url)
+	if err != nil {
+		log.Error("Could not download flashing tools!")
+		return
+	}
+	Unzip(fileName, tempToolsPath)
+	extension := ""
+	if runtime.GOOS == "windows" {
+		extension = ".exe"
+	}
+	globalToolsMap[name] = tempToolsPath + "/bin/" + name + extension
+}

hub.go

@@ -166,25 +166,6 @@ func checkCmd(m []byte) {
 			go spErr("You did not specify a port to close")
 		}
 
-	} else if strings.HasPrefix(sl, "programfromurl") {
-
-		args := strings.Split(s, " ")
-		if len(args) == 4 {
-			go spProgramFromUrl(args[1], args[2], args[3])
-		} else {
-			go spErr("You did not specify a port, a board to program and/or a URL")
-		}
-
-	} else if strings.HasPrefix(sl, "program") {
-
-		args := strings.Split(s, " ")
-		if len(args) > 3 {
-			var slice []string = args[3:len(args)]
-			go spProgram(args[1], args[2], strings.Join(slice, " "))
-		} else {
-			go spErr("You did not specify a port, a board to program and/or a filename")
-		}
-
 	} else if strings.HasPrefix(sl, "sendjson") {
 		// will catch sendjson
 
@@ -199,6 +180,11 @@ func checkCmd(m []byte) {
 	} else if strings.HasPrefix(sl, "list") {
 		go spList(false)
 		go spList(true)
+	} else if strings.HasPrefix(sl, "downloadtool") {
+		args := strings.Split(s, " ")
+		if len(args) > 2 {
+			go spDownloadTool(args[1], args[2])
+		}
 	} else if strings.HasPrefix(sl, "bufferalgorithm") {
 		go spBufferAlgorithms()
 	} else if strings.HasPrefix(sl, "log") {

main.go

@@ -11,6 +11,7 @@ import (
 	"github.com/kardianos/osext"
 	"github.com/vharitonsky/iniflags"
 	"go/build"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime/debug"
@@ -54,8 +55,10 @@ var (
 	// hostname. allow user to override, otherwise we look it up
 	hostname = flag.String("hostname", "unknown-hostname", "Override the hostname we get from the OS")
 
-	updateUrl = flag.String("updateUrl", "", "")
-	appName   = flag.String("appName", "", "")
+	updateUrl        = flag.String("updateUrl", "", "")
+	appName          = flag.String("appName", "", "")
+	globalToolsMap   = make(map[string]string)
+	tempToolsPath, _ = ioutil.TempDir("", "arduino-create-agent-tools")
 )
 
 type NullWriter int

programmer.go

@@ -8,44 +8,30 @@ import (
 	log "github.com/Sirupsen/logrus"
 	"github.com/facchinm/go-serial"
 	"github.com/kardianos/osext"
+	"github.com/mattn/go-shellwords"
 	"io"
 	"mime/multipart"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"
 )
 
 var compiling = false
 
-// Download the file from URL first, store in tmp folder, then pass to spProgram
-func spProgramFromUrl(portname string, boardname string, url string) {
-	mapB, _ := json.Marshal(map[string]string{"ProgrammerStatus": "DownloadStart", "Url": url})
-	h.broadcastSys <- mapB
-	filename, err := downloadFromUrl(url)
-	mapB, _ = json.Marshal(map[string]string{"ProgrammerStatus": "DownloadDone", "Filename": filename, "Url": url})
-	h.broadcastSys <- mapB
-
-	if err != nil {
-		spErr(err.Error())
-		return
-	} else {
-		spProgram(portname, boardname, filename)
-	}
-
-	// delete file
-
-}
-
 func colonToUnderscore(input string) string {
 	output := strings.Replace(input, ":", "_", -1)
 	return output
 }
 
-func spProgramNetwork(portname string, boardname string, filePath string) error {
+type basicAuthData struct {
+	UserName string
+	Password string
+}
+
+func spProgramNetwork(portname string, boardname string, filePath string, authdata basicAuthData) error {
 
 	log.Println("Starting network upload")
 	log.Println("Board Name: " + boardname)
@@ -91,7 +77,9 @@ func spProgramNetwork(portname string, boardname string, filePath string) error
 	}
 	// Don't forget to set the content type, this will contain the boundary.
 	req.Header.Set("Content-Type", w.FormDataContentType())
-	req.SetBasicAuth("root", "arduino")
+	if authdata.UserName != "" {
+		req.SetBasicAuth(authdata.UserName, authdata.Password)
+	}
 
 	//h.broadcastSys <- []byte("Start flashing with command " + cmdString)
 	log.Printf("Network flashing on " + portname)
@@ -128,61 +116,40 @@ func spProgramNetwork(portname string, boardname string, filePath string) error
 	return err
 }
 
-func spProgramLocal(portname string, boardname string, filePath string) {
-	isFound, flasher, mycmd := assembleCompilerCommand(boardname, portname, filePath)
-	mapD := map[string]string{"ProgrammerStatus": "CommandReady", "IsFound": strconv.FormatBool(isFound), "Flasher": flasher, "Cmd": strings.Join(mycmd, " ")}
-	mapB, _ := json.Marshal(mapD)
-	h.broadcastSys <- mapB
+func spProgramLocal(portname string, boardname string, filePath string, commandline string) {
 
-	if isFound {
-		spHandlerProgram(flasher, mycmd)
-	} else {
-		spErr("Could not find the board " + boardname + "  that you were trying to program.")
-		mapD := map[string]string{"ProgrammerStatus": "Failed", "IsFound": strconv.FormatBool(isFound), "Flasher": flasher, "Cmd": strings.Join(mycmd, " "), "Err": "Could not find the board " + boardname + "  that you were trying to program."}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-		return
-	}
+	z, _ := shellwords.Parse(commandline)
+	spHandlerProgram(z[0], z[1:])
 }
 
-func spProgram(portname string, boardname string, filePath string) {
+func spProgram(portname string, boardname string, filePath string, commandline string, networkPort bool, authdata basicAuthData) {
 
-	spProgramRW(portname, boardname, "", filePath)
+	spProgramRW(portname, boardname, "", filePath, commandline, networkPort, authdata)
 }
 
-func spProgramRW(portname string, boardname string, boardname_rewrite string, filePath string) {
+func spProgramRW(portname string, boardname string, boardname_rewrite string, filePath string, commandline string, networkPort bool, authdata basicAuthData) {
 	compiling = true
 
 	defer func() {
 		time.Sleep(1500 * time.Millisecond)
 		compiling = false
 	}()
 
-	// check if the port is physical or network
-	var networkPort bool
-	myport, exist := findPortByNameRerun(portname, false)
-	if !exist {
-		// it could be a network port that has not been found at the second lap
-		networkPort = true
-	} else {
-		networkPort = myport.NetworkPort
-	}
-
 	var err error
 
 	if networkPort {
 		if boardname_rewrite == "" {
-			err = spProgramNetwork(portname, boardname_rewrite, filePath)
+			err = spProgramNetwork(portname, boardname_rewrite, filePath, authdata)
 		} else {
-			err = spProgramNetwork(portname, boardname, filePath)
+			err = spProgramNetwork(portname, boardname, filePath, authdata)
 		}
 		if err != nil {
 			mapD := map[string]string{"ProgrammerStatus": "Error " + err.Error(), "Msg": "Could not program the board", "Output": "", "Err": err.Error()}
 			mapB, _ := json.Marshal(mapD)
 			h.broadcastSys <- mapB
 		}
 	} else {
-		spProgramLocal(portname, boardname, filePath)
+		spProgramLocal(portname, boardname, filePath, commandline)
 	}
 }
 
@@ -195,8 +162,8 @@ func spHandlerProgram(flasher string, cmdString []string) {
 	// 	cmdString = append([]string{flasher}, cmdString...)
 	// 	oscmd = exec.Command(sh, cmdString...)
 	// } else {
-	oscmd = exec.Command(flasher, cmdString...)
-	// }
+
+	oscmd = exec.Command(globalToolsMap[flasher], cmdString...)
 
 	// Stdout buffer
 	//var cmdOutput []byte