2
2
mirror of https://github.com/octoleo/restic.git synced 2024-12-22 02:48:55 +00:00

Simplify ui.StdioWrapper.Write

Instead of looping to find line breaks, make it look for the last one.
This commit is contained in:
greatroar 2020-10-17 20:23:36 +02:00
parent 863a590a81
commit 35419de232
2 changed files with 18 additions and 39 deletions

View File

@ -55,22 +55,12 @@ func (w *lineWriter) Write(data []byte) (n int, err error) {
// look for line breaks
buf := w.buf.Bytes()
skip := 0
for i := 0; i < len(buf); {
if buf[i] == '\n' {
// found line
w.print(string(buf[:i+1]))
buf = buf[i+1:]
skip += i + 1
i = 0
continue
}
i++
i := bytes.LastIndexByte(buf, '\n')
if i != -1 {
w.print(string(buf[:i+1]))
w.buf.Next(i + 1)
}
_ = w.buf.Next(skip)
return n, err
}

View File

@ -1,6 +1,7 @@
package ui
import (
"strings"
"testing"
"github.com/google/go-cmp/cmp"
@ -8,16 +9,14 @@ import (
func TestStdioWrapper(t *testing.T) {
var tests = []struct {
inputs [][]byte
outputs []string
inputs [][]byte
output string
}{
{
inputs: [][]byte{
[]byte("foo"),
},
outputs: []string{
"foo\n",
},
output: "foo\n",
},
{
inputs: [][]byte{
@ -26,10 +25,8 @@ func TestStdioWrapper(t *testing.T) {
[]byte("\n"),
[]byte("baz"),
},
outputs: []string{
"foobar\n",
output: "foobar\n" +
"baz\n",
},
},
{
inputs: [][]byte{
@ -37,11 +34,9 @@ func TestStdioWrapper(t *testing.T) {
[]byte("bar\nbaz\n"),
[]byte("bump\n"),
},
outputs: []string{
"foobar\n",
"baz\n",
output: "foobar\n" +
"baz\n" +
"bump\n",
},
},
{
inputs: [][]byte{
@ -53,23 +48,17 @@ func TestStdioWrapper(t *testing.T) {
[]byte("x"),
[]byte("z"),
},
outputs: []string{
"foobar\n",
"baz\n",
"bump\n",
output: "foobar\n" +
"baz\n" +
"bump\n" +
"xxxz\n",
},
},
}
for _, test := range tests {
t.Run("", func(t *testing.T) {
var lines []string
print := func(s string) {
lines = append(lines, s)
}
w := newLineWriter(print)
var output strings.Builder
w := newLineWriter(func(s string) { output.WriteString(s) })
for _, data := range test.inputs {
n, err := w.Write(data)
@ -87,8 +76,8 @@ func TestStdioWrapper(t *testing.T) {
t.Fatal(err)
}
if !cmp.Equal(test.outputs, lines) {
t.Error(cmp.Diff(test.outputs, lines))
if outstr := output.String(); outstr != test.output {
t.Error(cmp.Diff(test.output, outstr))
}
})
}