add resolve function

Author: matteosuppo

programmer/programmer.go

@@ -42,22 +42,33 @@ type Extra struct {
 }
 
 // Do performs a command on a port with a board attached to it
-func Do(port, board, path, commandline string, extra Extra, l logger) {
-	debug(l, port, board, path, commandline)
+func Do(port, board, file, commandline string, extra Extra, l logger) {
+	debug(l, port, board, file, commandline)
 	if extra.Network {
 		doNetwork()
 	} else {
-		doSerial(port, extra, l)
+		doSerial(port, board, file, commandline, extra, l)
 	}
 }
 
 func doNetwork() {}
 
-func doSerial(port string, extra Extra, l logger) {
+func doSerial(port, board, file, commandline string, extra Extra, l logger) error {
 	// some boards needs to be resetted
 	if extra.Use1200bpsTouch {
-		port, _ = reset(port, extra.WaitForUploadPort, l)
+		var err error
+		port, err = reset(port, extra.WaitForUploadPort, l)
+		if err != nil {
+			return errors.Wrapf(err, "Reset before upload")
+		}
 	}
+
+	// resolve commandline
+	info(l, "unresolved commandline ", commandline)
+	commandline = resolve(port, board, file, commandline, extra)
+	info(l, "resolved commandline ", commandline)
+
+	return nil
 }
 
 // reset opens the port at 1200bps. It returns the new port name (which could change

programmer/utils.go

@@ -1,5 +1,10 @@
 package programmer
 
+import (
+	"path/filepath"
+	"strings"
+)
+
 // differ returns the first item that differ between the two input slices
 func differ(slice1 []string, slice2 []string) string {
 	m := map[string]int{}
@@ -19,3 +24,18 @@ func differ(slice1 []string, slice2 []string) string {
 
 	return ""
 }
+
+// resolve replaces some symbols in the commandline with the appropriate values
+func resolve(port, board, file, commandline string, extra Extra) string {
+	commandline = strings.Replace(commandline, "{build.path}", filepath.ToSlash(filepath.Dir(file)), -1)
+	commandline = strings.Replace(commandline, "{build.project_name}", strings.TrimSuffix(filepath.Base(file), filepath.Ext(filepath.Base(file))), -1)
+	commandline = strings.Replace(commandline, "{serial.port}", port, -1)
+	commandline = strings.Replace(commandline, "{serial.port.file}", filepath.Base(port), -1)
+
+	if extra.Verbose == true {
+		commandline = strings.Replace(commandline, "{upload.verbose}", extra.ParamsVerbose, -1)
+	} else {
+		commandline = strings.Replace(commandline, "{upload.verbose}", extra.ParamsQuiet, -1)
+	}
+	return commandline
+}

programmer/utils_test.go

@@ -1,6 +1,9 @@
 package programmer
 
-import "testing"
+import (
+	"log"
+	"testing"
+)
 
 var TestDifferData = []struct {
 	Before []string
@@ -9,6 +12,7 @@ var TestDifferData = []struct {
 }{
 	{[]string{}, []string{}, ""},
 	{[]string{"/dev/ttyACM0", "/dev/sys"}, []string{"/dev/sys"}, "/dev/ttyACM0"},
+	{[]string{"/dev/sys"}, []string{"/dev/ttyACM0", "/dev/sys"}, "/dev/ttyACM0"},
 }
 
 func TestDiffer(t *testing.T) {
@@ -20,3 +24,28 @@ func TestDiffer(t *testing.T) {
 		}
 	}
 }
+
+var TestResolveData = []struct {
+	Port        string
+	Board       string
+	File        string
+	Commandline string
+	Extra       Extra
+	Result      string
+}{
+	{"/dev/ttyACM0", "arduino:avr:leonardo", "./programmer_test.hex",
+		`"{runtime.tools.avrdude.path}/bin/avrdude" "-C{runtime.tools.avrdude.path}/etc/avrdude.conf" {upload.verbose} {upload.verify} -patmega32u4 -cavr109 -P{serial.port} -b57600 -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"`, Extra{Use1200bpsTouch: true, WaitForUploadPort: true},
+		`"{runtime.tools.avrdude.path}/bin/avrdude" "-C{runtime.tools.avrdude.path}/etc/avrdude.conf"  {upload.verify} -patmega32u4 -cavr109 -P/dev/ttyACM0 -b57600 -D "-Uflash:w:./programmer_test.hex:i"`},
+}
+
+func TestResolve(t *testing.T) {
+	for _, test := range TestResolveData {
+		result := resolve(test.Port, test.Board, test.File, test.Commandline, test.Extra)
+		if result != test.Result {
+			log.Println(result)
+			log.Println(test.Result)
+			t.Error("expected " + test.Result + ", got " + result)
+			continue
+		}
+	}
+}