Skip to content

Commit b2838b8

Browse files
authored
update pb (#10)
* new interface * fixes some issues with go mod
1 parent abf88de commit b2838b8

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ module github.com/filecoin-project/go-paramfetch
33
go 1.22
44

55
require (
6+
github.com/cheggaaa/pb/v3 v3.1.5
67
github.com/ipfs/go-fs-lock v0.0.7
78
github.com/ipfs/go-log/v2 v2.5.1
89
github.com/stretchr/testify v1.9.0
910
go.uber.org/multierr v1.11.0
1011
golang.org/x/crypto v0.26.0
1112
golang.org/x/sync v0.8.0
1213
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
13-
gopkg.in/cheggaaa/pb.v1 v1.0.28
1414
)
1515

1616
require (
17+
github.com/VividCortex/ewma v1.2.0 // indirect
1718
github.com/davecgh/go-spew v1.1.1 // indirect
1819
github.com/fatih/color v1.17.0 // indirect
1920
github.com/ipfs/go-ipfs-util v0.0.3 // indirect

go.sum

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
1717
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
1818
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
1919
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
20+
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
21+
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
2022
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
2123
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
24+
github.com/cheggaaa/pb/v3 v3.1.5 h1:QuuUzeM2WsAqG2gMqtzaWithDJv0i+i6UlnwSCI4QLk=
25+
github.com/cheggaaa/pb/v3 v3.1.5/go.mod h1:CrxkeghYTXi1lQBEI7jSn+3svI3cuc19haAj6jM60XI=
2226
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
2327
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
2428
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -318,8 +322,6 @@ google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
318322
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
319323
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
320324
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
321-
gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=
322-
gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
323325
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
324326
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
325327
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

paramfetch.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
"sync"
1616
"time"
1717

18+
pb "github.com/cheggaaa/pb/v3"
1819
fslock "github.com/ipfs/go-fs-lock"
1920
logging "github.com/ipfs/go-log/v2"
2021
"go.uber.org/multierr"
2122
"golang.org/x/crypto/blake2b"
2223
"golang.org/x/xerrors"
23-
pb "gopkg.in/cheggaaa/pb.v1"
2424
)
2525

2626
var log = logging.Logger("paramfetch")
@@ -275,11 +275,8 @@ func doFetch(ctx context.Context, out string, info paramFile) error {
275275
}
276276
defer resp.Body.Close()
277277

278-
bar := pb.New64(fStat.Size() + resp.ContentLength)
279-
bar.Set64(fStat.Size())
280-
bar.Units = pb.U_BYTES
281-
bar.ShowSpeed = true
282-
bar.Start()
278+
bar := pb.New64(fStat.Size() + resp.ContentLength).
279+
SetCurrent(fStat.Size()).Start()
283280

284281
_, err = io.Copy(outf, bar.NewProxyReader(resp.Body))
285282

0 commit comments

Comments
 (0)