From f034f3e13a5c3b6167a255d0bae92930a7cbb889 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Thu, 22 Jan 2015 12:44:34 -0800 Subject: [PATCH] core/commands: Show download progress in 'get' --- core/commands/get.go | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/core/commands/get.go b/core/commands/get.go index 91a344149..e4df28141 100644 --- a/core/commands/get.go +++ b/core/commands/get.go @@ -19,6 +19,7 @@ import ( upb "github.com/jbenet/go-ipfs/unixfs/pb" proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb" ) var GetCmd = &cmds.Command{ @@ -99,7 +100,13 @@ may also specify the level of compression by specifying '-l=<1-9>'. } defer file.Close() - _, err = io.Copy(file, reader) + bar := pb.New(0).SetUnits(pb.U_BYTES) + bar.Output = os.Stderr + pbReader := bar.NewProxyReader(reader) + bar.Start() + defer bar.Finish() + + _, err = io.Copy(file, pbReader) if err != nil { res.SetError(err, cmds.ErrNormal) return @@ -110,6 +117,10 @@ may also specify the level of compression by specifying '-l=<1-9>'. fmt.Printf("Saving file(s) to %s\n", outPath) + // TODO: get total length of files + bar := pb.New(0).SetUnits(pb.U_BYTES) + bar.Output = os.Stderr + preexisting := true pathIsDir := false if stat, err := os.Stat(outPath); err != nil && os.IsNotExist(err) { @@ -129,11 +140,16 @@ may also specify the level of compression by specifying '-l=<1-9>'. return } defer gzipReader.Close() - tarReader = tar.NewReader(gzipReader) + pbReader := bar.NewProxyReader(gzipReader) + tarReader = tar.NewReader(pbReader) } else { - tarReader = tar.NewReader(reader) + pbReader := bar.NewProxyReader(reader) + tarReader = tar.NewReader(pbReader) } + bar.Start() + defer bar.Finish() + for i := 0; ; i++ { header, err := tarReader.Next() if err != nil && err != io.EOF {