AcivityWriter

coadler · coadler · commit 6b0a0d391cbc · 2020-06-12T18:16:21.000-05:00
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -144,13 +144,16 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
 		stdin := process.Stdin()
 		defer stdin.Close()
 
-		ap := &activity.Pusher{Source: "ssh", EnvID: env.ID, Client: entClient}
+		ap := &activity.Pusher{Source: sshActivityName, EnvID: env.ID, Client: entClient}
 		defer ap.Start()()
 
-		activity.Copy(ap, stdin, os.Stdin)
+		wr := activity.Writer(ap, stdin)
+		io.Copy(wr, os.Stdin)
 	}()
 	go io.Copy(os.Stdout, process.Stdout())
 	go io.Copy(os.Stderr, process.Stderr())
 
 	return process.Wait()
 }
+
+const sshActivityName = "ssh"
diff --git a/internal/activity/copy.go b/internal/activity/copy.go
@@ -2,35 +2,16 @@ package activity
 
 import "io"
 
-// Copy copyes src to dst, pushing activity when bytes are read from src.
-func Copy(p *Pusher, dst io.Writer, src io.Reader) (written int64, err error) {
-	buf := make([]byte, 32*1024)
-
-	for {
-		nr, er := src.Read(buf)
-		if nr > 0 {
-			p.Push()
+type activityWriter struct {
+	p  *Pusher
+	wr io.Writer
+}
 
-			nw, ew := dst.Write(buf[0:nr])
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		}
-		if er != nil {
-			if er != io.EOF {
-				err = er
-			}
-			break
-		}
-	}
+func (w *activityWriter) Write(p []byte) (n int, err error) {
+	w.p.Push()
+	return w.wr.Write(p)
+}
 
-	return written, err
+func Writer(p *Pusher, wr io.Writer) io.Writer {
+	return &activityWriter{p: p, wr: wr}
 }
