add context to files reading

whyrusleeping · whyrusleeping · commit 39db30cfafc9 · 2016-01-12T06:06:10.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/commands/files/files.go b/core/commands/files/files.go
@@ -361,7 +361,7 @@ Examples:
 			res.SetError(err, cmds.ErrNormal)
 			return
 		}
-		var r io.Reader = fi
+		var r io.Reader = &contextReaderWrapper{R: fi, ctx: req.Context()}
 		count, found, err := req.Option("count").Int()
 		if err != nil {
 			res.SetError(err, cmds.ErrNormal)
@@ -379,6 +379,19 @@ Examples:
 	},
 }
 
+type contextReader interface {
+	CtxReadFull(context.Context, []byte) (int, error)
+}
+
+type contextReaderWrapper struct {
+	R   contextReader
+	ctx context.Context
+}
+
+func (crw *contextReaderWrapper) Read(b []byte) (int, error) {
+	return crw.R.CtxReadFull(crw.ctx, b)
+}
+
 var FilesMvCmd = &cmds.Command{
 	Helptext: cmds.HelpText{
 		Tagline: "Move files",
