diff --git a/CHANGELOG.md b/CHANGELOG.md index 1062d676faa..003b4f19933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -117,6 +117,7 @@ From https://github.com/filecoin-project/lotus/compare/v1.28.2...release/v1.29.0 - github.com/filecoin-project/jackc/pgx (v5.4.1 -> v5.6.0) - feat(f3): update from v0.0.7 to v0.1.0 (#12382) ([filecoin-project/lotus#12382](https://github.com/filecoin-project/lotus/pull/12382)) - feat: f3: update go-f3 to 0.2.0 (#12390) ([filecoin-project/lotus#12390](https://github.com/filecoin-project/lotus/pull/12390)) +- feat: update cheggaaa's pb to v3 ([filecoin-project/lotus#12518](https://github.com/filecoin-project/lotus/pull/12518)) ### Chores diff --git a/cmd/lotus-miner/init_restore.go b/cmd/lotus-miner/init_restore.go index 272754c23d4..05721f6cf56 100644 --- a/cmd/lotus-miner/init_restore.go +++ b/cmd/lotus-miner/init_restore.go @@ -5,13 +5,13 @@ import ( "encoding/json" "os" + "github.com/cheggaaa/pb/v3" "github.com/docker/go-units" "github.com/ipfs/go-datastore" "github.com/libp2p/go-libp2p/core/peer" "github.com/mitchellh/go-homedir" "github.com/urfave/cli/v2" "golang.org/x/xerrors" - "gopkg.in/cheggaaa/pb.v1" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-paramfetch" @@ -235,14 +235,9 @@ func restore(ctx context.Context, cctx *cli.Context, targetPath string, strConfi return err } - bar := pb.New64(st.Size()) + bar := pb.Full.Start64(st.Size()) br := bar.NewProxyReader(f) - bar.ShowTimeLeft = true - bar.ShowPercent = true - bar.ShowSpeed = true - bar.Units = pb.U_BYTES - bar.Start() err = backupds.RestoreInto(br, mds) bar.Finish() diff --git a/cmd/lotus-shed/sectors.go b/cmd/lotus-shed/sectors.go index 176f232fe6a..6ca214cd2dc 100644 --- a/cmd/lotus-shed/sectors.go +++ b/cmd/lotus-shed/sectors.go @@ -15,10 +15,10 @@ import ( "strconv" "sync" + "github.com/cheggaaa/pb/v3" "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" "golang.org/x/xerrors" - "gopkg.in/cheggaaa/pb.v1" "github.com/filecoin-project/go-address" "github.com/filecoin-project/go-bitfield" @@ -542,20 +542,16 @@ fr32 padding is removed from the output.`, l := int64(abi.PaddedPieceSize(length).Unpadded()) - bar := pb.New64(l) + bar := pb.Full.Start64(l) br := bar.NewProxyReader(upr) - bar.ShowTimeLeft = true - bar.ShowPercent = true - bar.ShowSpeed = true - bar.Units = pb.U_BYTES - bar.Output = os.Stderr - bar.Start() _, err = io.CopyN(os.Stdout, br, l) + + bar.Finish() + if err != nil { return xerrors.Errorf("reading data: %w", err) } - return nil }, } diff --git a/cmd/lotus/backup.go b/cmd/lotus/backup.go index efbac3e2bb0..0fbdf29622c 100644 --- a/cmd/lotus/backup.go +++ b/cmd/lotus/backup.go @@ -3,11 +3,11 @@ package main import ( "os" + "github.com/cheggaaa/pb/v3" dstore "github.com/ipfs/go-datastore" "github.com/mitchellh/go-homedir" "github.com/urfave/cli/v2" "golang.org/x/xerrors" - "gopkg.in/cheggaaa/pb.v1" "github.com/filecoin-project/go-jsonrpc" @@ -92,14 +92,9 @@ func restore(cctx *cli.Context, r repo.Repo) error { return err } - bar := pb.New64(st.Size()) + bar := pb.Full.Start64(st.Size()) br := bar.NewProxyReader(f) - bar.ShowTimeLeft = true - bar.ShowPercent = true - bar.ShowSpeed = true - bar.Units = pb.U_BYTES - bar.Start() err = backupds.RestoreInto(br, mds) bar.Finish() diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go index e13557a943a..b2bc247f924 100644 --- a/cmd/lotus/daemon.go +++ b/cmd/lotus/daemon.go @@ -16,6 +16,7 @@ import ( "strings" "github.com/DataDog/zstd" + "github.com/cheggaaa/pb/v3" metricsprom "github.com/ipfs/go-metrics-prometheus" "github.com/mitchellh/go-homedir" "github.com/multiformats/go-multiaddr" @@ -25,7 +26,6 @@ import ( "go.opencensus.io/stats/view" "go.opencensus.io/tag" "golang.org/x/xerrors" - "gopkg.in/cheggaaa/pb.v1" "github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-paramfetch" @@ -569,12 +569,8 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool) return xerrors.Errorf("peek header: %w", err) } - bar := pb.New64(l) + bar := pb.Full.New(int(l)) br := bar.NewProxyReader(bufr) - bar.ShowTimeLeft = true - bar.ShowPercent = true - bar.ShowSpeed = true - bar.Units = pb.U_BYTES var ir io.Reader = br diff --git a/go.mod b/go.mod index fc77773ae90..543faf226d8 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/Kubuxu/imtui v0.0.0-20210401140320-41663d68d0fa github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921 + github.com/cheggaaa/pb/v3 v3.1.5 github.com/chzyer/readline v1.5.1 github.com/containerd/cgroups v1.1.0 github.com/coreos/go-systemd/v22 v22.5.0 @@ -162,7 +163,6 @@ require ( golang.org/x/time v0.5.0 golang.org/x/tools v0.24.0 golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 - gopkg.in/cheggaaa/pb.v1 v1.0.28 gotest.tools v2.2.0+incompatible ) @@ -172,6 +172,7 @@ require ( github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/StackExchange/wmi v1.2.1 // indirect + github.com/VividCortex/ewma v1.2.0 // indirect github.com/akavel/rsrc v0.8.0 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect @@ -332,6 +333,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect diff --git a/go.sum b/go.sum index ed9e0ed3779..90f924215e1 100644 --- a/go.sum +++ b/go.sum @@ -73,6 +73,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/Stebalien/go-bitfield v0.0.1/go.mod h1:GNjFpasyUVkHMsfEOk8EFLJ9syQ6SI+XWrX9Wf2XH0s= +github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= +github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= @@ -135,6 +137,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cheggaaa/pb/v3 v3.1.5 h1:QuuUzeM2WsAqG2gMqtzaWithDJv0i+i6UlnwSCI4QLk= +github.com/cheggaaa/pb/v3 v3.1.5/go.mod h1:CrxkeghYTXi1lQBEI7jSn+3svI3cuc19haAj6jM60XI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=