git.iko.soy/crush
on main help sign in
fix(bangmode): interleave stderr and stdout
48e9ccaKieran Klukas
internal/shell/stream.go+10−15
compare with main
unifiedsplit
@@ -3,20 +3,24 @@ package shell
3import (
3import (
4 "bytes"
4 "bytes"
5 "context"
5 "context"
6− "log/slog"
7 "os"
6 "os"
7+ "sync"
8)
8)
9
9
10// progressWriter wraps an io.Writer and calls onProgress with each write.
10// progressWriter wraps an io.Writer and calls onProgress with each write.
11+// It is safe for concurrent use from multiple goroutines (e.g. stdout and
12+// stderr writing simultaneously).
11type progressWriter struct {
13type progressWriter struct {
14+ mu sync.Mutex
12 buf bytes.Buffer
15 buf bytes.Buffer
13 onProgress func(string)
16 onProgress func(string)
14}
17}
15
18
16func (w *progressWriter) Write(p []byte) (int, error) {
19func (w *progressWriter) Write(p []byte) (int, error) {
20+ w.mu.Lock()
21+ defer w.mu.Unlock()
17 n, err := w.buf.Write(p)
22 n, err := w.buf.Write(p)
18 if n > 0 && w.onProgress != nil {
23 if n > 0 && w.onProgress != nil {
19− slog.Debug("Shell stream progress", "bytes", n)
20 w.onProgress(string(p[:n]))
24 w.onProgress(string(p[:n]))
21 }
25 }
22 return n, err
26 return n, err
@@ -30,10 +34,9 @@ func RunAndCaptureStream(ctx context.Context, opts RunOptions, onProgress func(s
30 }
34 }
31 opts.Env = append(opts.Env, ptyColorEnvVars...)
35 opts.Env = append(opts.Env, ptyColorEnvVars...)
32
36
33− stdout := &progressWriter{onProgress: onProgress}
34− stderr := &progressWriter{onProgress: onProgress}
37+ buf := &progressWriter{onProgress: onProgress}
35− opts.Stdout = stdout
38+ opts.Stdout = buf
36− opts.Stderr = stderr
39+ opts.Stderr = buf
37
40
38 runErr := Run(ctx, opts)
41 runErr := Run(ctx, opts)
39
42
@@ -42,16 +45,8 @@ func RunAndCaptureStream(ctx context.Context, opts RunOptions, onProgress func(s
42 exitCode = ExitCode(runErr)
45 exitCode = ExitCode(runErr)
43 }
46 }
44
47
45− output := stdout.buf.String()
46− if stderr.buf.Len() > 0 {
47− if output != "" {
48− output += "\n"
49− }
50− output += stderr.buf.String()
51− }
52−
53 return CaptureResult{
48 return CaptureResult{
54− Output: output,
49+ Output: buf.buf.String(),
55 ExitCode: exitCode,
50 ExitCode: exitCode,
56 }, nil
51 }, nil
57}
52}