retrieval: Cleanup retrieve command output

This commit is contained in:
Łukasz Magiera 2021-11-15 17:40:05 +01:00
parent 9c119bfdad
commit 8ea5162ad9

View File

@ -13,6 +13,8 @@ import (
"os" "os"
"path" "path"
"sort" "sort"
"strings"
"time"
"github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/node/repo"
"github.com/ipfs/go-blockservice" "github.com/ipfs/go-blockservice"
@ -147,6 +149,7 @@ func retrieve(ctx context.Context, cctx *cli.Context, fapi lapi.FullNode, sel *l
return nil, xerrors.Errorf("error setting up retrieval: %w", err) return nil, xerrors.Errorf("error setting up retrieval: %w", err)
} }
start := time.Now()
readEvents: readEvents:
for { for {
var evt lapi.RetrievalInfo var evt lapi.RetrievalInfo
@ -167,12 +170,14 @@ func retrieve(ctx context.Context, cctx *cli.Context, fapi lapi.FullNode, sel *l
event = retrievalmarket.ClientEvents[*evt.Event] event = retrievalmarket.ClientEvents[*evt.Event]
} }
printf("> Recv: %s, Paid %s, %s (%s)\n", printf("Recv %s, Paid %s, %s (%s), %s\n",
types.SizeStr(types.NewInt(evt.BytesReceived)), types.SizeStr(types.NewInt(evt.BytesReceived)),
types.FIL(evt.TotalPaid), types.FIL(evt.TotalPaid),
event, strings.TrimPrefix(event, "ClientEvent"),
retrievalmarket.DealStatuses[evt.Status], strings.TrimPrefix(retrievalmarket.DealStatuses[evt.Status], "DealStatus"),
time.Now().Sub(start).Truncate(time.Millisecond),
) )
switch evt.Status { switch evt.Status {
case retrievalmarket.DealStatusCompleted: case retrievalmarket.DealStatusCompleted:
break readEvents break readEvents