coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-01 14:28:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

core/commands: Show download progress in 'get'

Browse Source
This commit is contained in:
Matt Bell 2015-01-22 12:44:34 -08:00
parent f3c4f87ec2
commit f034f3e13a
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/commands/get.go
View File

@ -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 {