Change PrintOutput to format arrays #37

Author: boki

cmd/internal/runtest.go

@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"strings"
 	"sync"
 	"time"
 
@@ -135,6 +136,13 @@ func PrintOutput(f *Formatter, output *perfops.RunOutput) {
 			o := r.Output
 			if o == "-2" {
 				o = "The command timed-out. It either took too long to execute or we could not connect to your target at all."
+			} else if a, ok := o.([]interface{}); ok {
+				sb := strings.Builder{}
+				for _, i := range a {
+					sb.WriteString(fmt.Sprintf("%s\n", i))
+				}
+				s := sb.String()
+				o = s[:len(s)-1]
 			}
 			f.Printf("Node%d, AS%d, %s, %s\n%s\n", n.ID, n.AsNumber, n.City, n.Country.Name, o)
 		} else if r.Message != "NO DATA" {
@@ -197,14 +205,15 @@ func (f *Formatter) Flush(limit bool) error {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 
-	if len(f.buf.Bytes()) == 0 {
+	buf := f.buf.Bytes()
+	f.buf.Reset()
+	if len(buf) == 0 {
 		return nil
 	}
-	defer f.buf.Reset()
 
 	termStartOfRow(f.w)
 	if limit {
-		out := string(f.buf.Bytes())
+		out := string(buf)
 		width := 0
 		lines := 0
 		for _, r := range out {
@@ -222,7 +231,7 @@ func (f *Formatter) Flush(limit bool) error {
 				return err
 			}
 		}
-	} else if _, err := f.w.Write(f.buf.Bytes()); err != nil {
+	} else if _, err := f.w.Write(buf); err != nil {
 		return err
 	}
 	return f.w.Flush()

cmd/internal/runtest_test.go

@@ -92,6 +92,14 @@ func TestPrintOutput(t *testing.T) {
 			},
 			"\x1b[200DNode27, AS23456, Hong Kong, Hong Kong\nThe command timed-out. It either took too long to execute or we could not connect to your target at all.\n",
 		},
+		"array output": {
+			func() *perfops.RunOutput {
+				var o *perfops.RunOutput
+				json.Unmarshal([]byte(`{"id":"6e0c06f7445bb8c63949f84fcdbdae55","items":[{"id":"2bff5d6b3a4df8a268afca6c60977032","result":{"dnsServer":"","node":{"as_number":197328,"id":103,"latitude":41.030549854339,"longitude":28.987083435058,"country":{"id":93,"name":"Turkey","continent":{"id":2,"name":"Asia","iso":"AS"},"iso":"TR","iso_numeric":"792","is_eu":false},"city":"Istanbul","sub_region":"Western Asia"},"finished":true,"output":["header","  1 row", " 10 row"],"time":1539517079.937741}}],"requested":"ns2.no-ip.com","finished":"true","elapsedTime":2.21,"creditsWithdrawn":1}`), &o)
+				return o
+			},
+			"\x1b[200DNode103, AS197328, Istanbul, Turkey\nheader\n  1 row\n 10 row\n",
+		},
 	}
 
 	var b bytes.Buffer