Flushing remaining output from BufferedUntilNewLineWriter once process has

ended. Also printing raw bytes instead of converting them into chars.

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

src/arduino.cc/builder/builder_utils/utils.go

@@ -319,17 +319,19 @@ func ExecRecipe(properties map[string]string, recipe string, removeUnsetProperti
 	}
 
 	if echoOutput {
-		printToStdOut := func(s string) {
-			logger.UnformattedFprintln(os.Stdout, s)
+		printToStdOut := func(data []byte) {
+			logger.UnformattedWrite(os.Stdout, data)
 		}
 		stdout := &types.BufferedUntilNewLineWriter{PrintFunc: printToStdOut, Buffer: bytes.Buffer{}}
+		defer stdout.Flush()
 		command.Stdout = stdout
 	}
 
-	printToStdErr := func(s string) {
-		logger.UnformattedFprintln(os.Stderr, s)
+	printToStdErr := func(data []byte) {
+		logger.UnformattedWrite(os.Stderr, data)
 	}
 	stderr := &types.BufferedUntilNewLineWriter{PrintFunc: printToStdErr, Buffer: bytes.Buffer{}}
+	defer stderr.Flush()
 	command.Stderr = stderr
 
 	if echoOutput {

src/arduino.cc/builder/i18n/i18n.go

@@ -46,6 +46,7 @@ var PLACEHOLDER = regexp.MustCompile("{(\\d)}")
 type Logger interface {
 	Fprintln(w io.Writer, level string, format string, a ...interface{})
 	UnformattedFprintln(w io.Writer, s string)
+	UnformattedWrite(w io.Writer, data []byte)
 	Println(level string, format string, a ...interface{})
 	Name() string
 }
@@ -56,6 +57,8 @@ func (s NoopLogger) Fprintln(w io.Writer, level string, format string, a ...inte
 
 func (s NoopLogger) UnformattedFprintln(w io.Writer, str string) {}
 
+func (s NoopLogger) UnformattedWrite(w io.Writer, data []byte) {}
+
 func (s NoopLogger) Println(level string, format string, a ...interface{}) {}
 
 func (s NoopLogger) Name() string {
@@ -76,6 +79,10 @@ func (s HumanLogger) Println(format string, level string, a ...interface{}) {
 	s.Fprintln(os.Stdout, level, Format(format, a...))
 }
 
+func (s HumanLogger) UnformattedWrite(w io.Writer, data []byte) {
+	write(w, data)
+}
+
 func (s HumanLogger) Name() string {
 	return "human"
 }
@@ -98,6 +105,10 @@ func (s MachineLogger) Name() string {
 	return "machine"
 }
 
+func (s MachineLogger) UnformattedWrite(w io.Writer, data []byte) {
+	write(w, data)
+}
+
 func printMachineFormattedLogLine(w io.Writer, level string, format string, a []interface{}) {
 	a = append([]interface{}(nil), a...)
 	for idx, value := range a {
@@ -117,6 +128,12 @@ func fprintln(w io.Writer, s string) {
 	fmt.Fprintln(w, s)
 }
 
+func write(w io.Writer, data []byte) {
+	lock.Lock()
+	defer lock.Unlock()
+	w.Write(data)
+}
+
 func fprintf(w io.Writer, format string, a ...interface{}) {
 	lock.Lock()
 	defer lock.Unlock()

src/arduino.cc/builder/test/builder_test.go

@@ -32,6 +32,7 @@ package test
 import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
+	"arduino.cc/builder/i18n"
 	"github.com/stretchr/testify/require"
 	"os"
 	"os/exec"
@@ -92,6 +93,7 @@ func TestBuilderBridge(t *testing.T) {
 	context[constants.CTX_OTHER_LIBRARIES_FOLDERS] = []string{"libraries"}
 	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
 	context[constants.CTX_VERBOSE] = true
+	context[constants.CTX_LOGGER] = i18n.MachineLogger{}
 
 	command := builder.Builder{}
 	err := command.Run(context)
@@ -127,6 +129,8 @@ func TestBuilderSketchWithConfig(t *testing.T) {
 	context[constants.CTX_BUILT_IN_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
 	context[constants.CTX_OTHER_LIBRARIES_FOLDERS] = []string{"libraries"}
 	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+	context[constants.CTX_VERBOSE] = true
+	context[constants.CTX_LOGGER] = i18n.NoopLogger{}
 
 	command := builder.Builder{}
 	err := command.Run(context)

src/arduino.cc/builder/types/accessories.go

@@ -86,7 +86,7 @@ type BufferedUntilNewLineWriter struct {
 	lock      sync.Mutex
 }
 
-type PrintFunc func(string)
+type PrintFunc func([]byte)
 
 func (w *BufferedUntilNewLineWriter) Write(p []byte) (n int, err error) {
 	w.lock.Lock()
@@ -98,10 +98,22 @@ func (w *BufferedUntilNewLineWriter) Write(p []byte) (n int, err error) {
 	}
 
 	bytesUntilNewLine, err := w.Buffer.ReadBytes('\n')
-	if err != nil && len(bytesUntilNewLine) > 0 {
-		bytesUntilNewLine = bytesUntilNewLine[:len(bytesUntilNewLine)-1]
-		w.PrintFunc(string(bytesUntilNewLine))
+	if err == nil {
+		w.PrintFunc(bytesUntilNewLine)
 	}
 
 	return writtenToBuffer, err
 }
+
+func (w *BufferedUntilNewLineWriter) Flush() {
+	w.lock.Lock()
+	defer w.lock.Unlock()
+
+	remainingBytes := w.Buffer.Bytes()
+	if len(remainingBytes) > 0 {
+		if remainingBytes[len(remainingBytes)-1] != '\n' {
+			remainingBytes = append(remainingBytes, '\n')
+		}
+		w.PrintFunc(remainingBytes)
+	}
+}