core/commands: Show download progress in 'get'
Matt Bell committed
Jan 22, 2015 at 12:44 UTC
f034f3e13a5c3b6167a255d0bae92930a7cbb889
1 file changed
+19
-3
core/commands/get.go
+19
-3
@@ -19,6 +19,7 @@ import (
19
upb "github.com/jbenet/go-ipfs/unixfs/pb"
20
21
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
22
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/cheggaaa/pb"
23
)
24
25
var GetCmd = &cmds.Command{
@@ -99,7 +100,13 @@ may also specify the level of compression by specifying '-l=<1-9>'.
100
}
101
defer file.Close()
102
102
- _, err = io.Copy(file, reader)
103
+ bar := pb.New(0).SetUnits(pb.U_BYTES)
104
+ bar.Output = os.Stderr
105
+ pbReader := bar.NewProxyReader(reader)
106
+ bar.Start()
107
+ defer bar.Finish()
108
+
109
+ _, err = io.Copy(file, pbReader)
110
if err != nil {
111
res.SetError(err, cmds.ErrNormal)
112
return
@@ -110,6 +117,10 @@ may also specify the level of compression by specifying '-l=<1-9>'.
117
118
fmt.Printf("Saving file(s) to %s\n", outPath)
119
120
+ // TODO: get total length of files
121
+ bar := pb.New(0).SetUnits(pb.U_BYTES)
122
+ bar.Output = os.Stderr
123
+
124
preexisting := true
125
pathIsDir := false
126
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>'.
140
return
141
}
142
defer gzipReader.Close()
132
- tarReader = tar.NewReader(gzipReader)
143
+ pbReader := bar.NewProxyReader(gzipReader)
144
+ tarReader = tar.NewReader(pbReader)
145
} else {
134
- tarReader = tar.NewReader(reader)
146
+ pbReader := bar.NewProxyReader(reader)
147
+ tarReader = tar.NewReader(pbReader)
148
}
149
150
+ bar.Start()
151
+ defer bar.Finish()
152
+
153
for i := 0; ; i++ {
154
header, err := tarReader.Next()
155
if err != nil && err != io.EOF {