Merge branch 'devel' into seriallist_native_rebased

Author: facchinm

conn.go

@@ -11,7 +11,9 @@ import (
 	"encoding/hex"
 	"encoding/pem"
 	"errors"
+	"io/ioutil"
 	"net/http"
+	"path"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/utilities"
@@ -46,16 +48,22 @@ func (s *WsServer) ServeHTTP(c *gin.Context) {
 	s.Server.ServeHTTP(c.Writer, c.Request)
 }
 
+type AdditionalFile struct {
+	Hex      []byte `json:"hex"`
+	Filename string `json:"filename"`
+}
+
 // Upload contains the data to upload a sketch onto a board
 type Upload struct {
-	Port        string         `json:"port"`
-	Board       string         `json:"board"`
-	Rewrite     string         `json:"rewrite"`
-	Commandline string         `json:"commandline"`
-	Signature   string         `json:"signature"`
-	Extra       boardExtraInfo `json:"extra"`
-	Hex         []byte         `json:"hex"`
-	Filename    string         `json:"filename"`
+	Port        string           `json:"port"`
+	Board       string           `json:"board"`
+	Rewrite     string           `json:"rewrite"`
+	Commandline string           `json:"commandline"`
+	Signature   string           `json:"signature"`
+	Extra       boardExtraInfo   `json:"extra"`
+	Hex         []byte           `json:"hex"`
+	Filename    string           `json:"filename"`
+	ExtraFiles  []AdditionalFile `json:"extrafiles"`
 }
 
 func uploadHandler(c *gin.Context) {
@@ -96,17 +104,21 @@ func uploadHandler(c *gin.Context) {
 
 	buffer := bytes.NewBuffer(data.Hex)
 
-	path, err := utilities.SaveFileonTempDir(data.Filename, buffer)
+	filepath, err := utilities.SaveFileonTempDir(data.Filename, buffer)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
 
+	for _, extraFile := range data.ExtraFiles {
+		ioutil.WriteFile(path.Join(path.Dir(filepath), extraFile.Filename), extraFile.Hex, 0644)
+	}
+
 	if data.Rewrite != "" {
 		data.Board = data.Rewrite
 	}
 
-	go spProgramRW(data.Port, data.Board, path, data.Commandline, data.Extra)
+	go spProgramRW(data.Port, data.Board, filepath, data.Commandline, data.Extra)
 
 	c.String(http.StatusAccepted, "")
 }

programmer.go

@@ -227,15 +227,15 @@ func spProgramLocal(portname string, boardname string, filePath string, commandl
 
 	log.Printf("Received commandline (unresolved):" + commandline)
 
-	commandline = strings.Replace(commandline, "{build.path}", filepath.ToSlash(filepath.Dir(filePath)), 1)
-	commandline = strings.Replace(commandline, "{build.project_name}", strings.TrimSuffix(filepath.Base(filePath), filepath.Ext(filepath.Base(filePath))), 1)
-	commandline = strings.Replace(commandline, "{serial.port}", portname, 1)
-	commandline = strings.Replace(commandline, "{serial.port.file}", filepath.Base(portname), 1)
+	commandline = strings.Replace(commandline, "{build.path}", filepath.ToSlash(filepath.Dir(filePath)), -1)
+	commandline = strings.Replace(commandline, "{build.project_name}", strings.TrimSuffix(filepath.Base(filePath), filepath.Ext(filepath.Base(filePath))), -1)
+	commandline = strings.Replace(commandline, "{serial.port}", portname, -1)
+	commandline = strings.Replace(commandline, "{serial.port.file}", filepath.Base(portname), -1)
 
 	if extraInfo.Verbose == true {
-		commandline = strings.Replace(commandline, "{upload.verbose}", extraInfo.ParamsVerbose, 1)
+		commandline = strings.Replace(commandline, "{upload.verbose}", extraInfo.ParamsVerbose, -1)
 	} else {
-		commandline = strings.Replace(commandline, "{upload.verbose}", extraInfo.ParamsQuiet, 1)
+		commandline = strings.Replace(commandline, "{upload.verbose}", extraInfo.ParamsQuiet, -1)
 	}
 
 	// search for runtime variables and replace with values from globalToolsMap
@@ -328,7 +328,7 @@ func spHandlerProgram(flasher string, cmdString []string) error {
 		return err
 	}
 
-	multi := io.MultiReader(stderr, stdout)
+	//multi := io.MultiReader(stderr, stdout)
 
 	// Stdout buffer
 	//var cmdOutput []byte
@@ -341,16 +341,29 @@ func spHandlerProgram(flasher string, cmdString []string) error {
 
 	err = oscmd.Start()
 
-	in := bufio.NewScanner(multi)
+	stdout_copy := bufio.NewScanner(stdout)
+	stderr_copy := bufio.NewScanner(stderr)
 
-	in.Split(bufio.ScanLines)
+	stdout_copy.Split(bufio.ScanLines)
+	stderr_copy.Split(bufio.ScanLines)
 
-	for in.Scan() {
-		log.Info(in.Text())
-		mapD := map[string]string{"ProgrammerStatus": "Busy", "Msg": in.Text()}
-		mapB, _ := json.Marshal(mapD)
-		h.broadcastSys <- mapB
-	}
+	go func() {
+		for stdout_copy.Scan() {
+			log.Info(stdout_copy.Text())
+			mapD := map[string]string{"ProgrammerStatus": "Busy", "Msg": stdout_copy.Text()}
+			mapB, _ := json.Marshal(mapD)
+			h.broadcastSys <- mapB
+		}
+	}()
+
+	go func() {
+		for stderr_copy.Scan() {
+			log.Info(stderr_copy.Text())
+			mapD := map[string]string{"ProgrammerStatus": "Busy", "Msg": stderr_copy.Text()}
+			mapB, _ := json.Marshal(mapD)
+			h.broadcastSys <- mapB
+		}
+	}()
 
 	err = oscmd.Wait()
 

tools/download.go

@@ -53,7 +53,7 @@ type index struct {
 var systems = map[string]string{
 	"linuxamd64":  "x86_64-linux-gnu",
 	"linux386":    "i686-linux-gnu",
-	"darwinamd64": "i386-apple-darwin11",
+	"darwinamd64": "apple-darwin",
 	"windows386":  "i686-mingw32",
 }
 
@@ -71,15 +71,13 @@ func checkGPGSig(fileName string, sigFileName string) error {
 	if err != nil {
 		return err
 	}
-
 	defer sigFile.Close()
 
 	// Get a Reader for the signature file
 	file, err := os.Open(fileName)
 	if err != nil {
 		return err
 	}
-
 	defer file.Close()
 
 	publicKeyBin, err := hex.DecodeString(publicKeyHex)
@@ -241,7 +239,10 @@ func (t *Tools) Download(name, version, behaviour string) error {
 		return err
 	}
 
-	t.installDrivers(location)
+	err = t.installDrivers(location)
+	if err != nil {
+		return err
+	}
 
 	// Ensure that the files are executable
 	t.Logger.Println("Ensure that the files are executable")
@@ -413,10 +414,9 @@ func extractTarGz(body []byte, location string) (string, error) {
 		}
 
 		file, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, info.Mode())
-		if err != nil {
-			//return location, err
+		if err == nil {
+			defer file.Close()
 		}
-		defer file.Close()
 		_, err = io.Copy(file, tarReader)
 		if err != nil {
 			//return location, err
@@ -425,15 +425,26 @@ func extractTarGz(body []byte, location string) (string, error) {
 	return location, nil
 }
 
-func (t *Tools) installDrivers(location string) {
+func (t *Tools) installDrivers(location string) error {
 	if runtime.GOOS == "windows" {
 		if _, err := os.Stat(filepath.Join(location, "post_install.bat")); err == nil {
 			t.Logger.Println("Installing drivers")
-			oscmd := exec.Command(filepath.Join(location, "post_install.bat"))
-			TellCommandNotToSpawnShell(oscmd)
-			oscmd.Run()
+			ok := MessageBox("Installing drivers", "We are about to install some drivers needed to use Arduino/Genuino boards\nDo you want to continue?")
+			t.Logger.Println(ok)
+			if ok == 6 {
+				os.Chdir(location)
+				oscmd := exec.Command("post_install.bat")
+				TellCommandNotToSpawnShell(oscmd)
+				t.Logger.Println(oscmd)
+				err = oscmd.Run()
+				t.Logger.Println(err)
+				return err
+			} else {
+				return errors.New("Could not install drivers")
+			}
 		}
 	}
+	return nil
 }
 
 func extractBz2(body []byte, location string) (string, error) {
@@ -481,10 +492,9 @@ func extractBz2(body []byte, location string) (string, error) {
 		}
 
 		file, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, info.Mode())
-		if err != nil {
-			//return location, err
+		if err == nil {
+			defer file.Close()
 		}
-		defer file.Close()
 		_, err = io.Copy(file, tarReader)
 		if err != nil {
 			//return location, err

tools/hidefile_darwin.go

@@ -10,3 +10,7 @@ func hideFile(path string) {
 
 func TellCommandNotToSpawnShell(_ *exec.Cmd) {
 }
+
+func MessageBox(title, text string) int {
+	return 0
+}

tools/hidefile_linux.go

@@ -10,3 +10,7 @@ func hideFile(path string) {
 
 func TellCommandNotToSpawnShell(_ *exec.Cmd) {
 }
+
+func MessageBox(title, text string) int {
+	return 0
+}

tools/hidefile_windows.go

@@ -3,6 +3,7 @@ package tools
 import (
 	"os/exec"
 	"syscall"
+	"unsafe"
 )
 
 func hideFile(path string) {
@@ -15,3 +16,15 @@ func hideFile(path string) {
 func TellCommandNotToSpawnShell(oscmd *exec.Cmd) {
 	oscmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
 }
+
+func MessageBox(title, text string) int {
+	var mod = syscall.NewLazyDLL("user32.dll")
+	var proc = mod.NewProc("MessageBoxW")
+	var MB_YESNO = 0x00000004
+
+	ret, _, _ := proc.Call(0,
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(text))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(title))),
+		uintptr(MB_YESNO))
+	return int(ret)
+}