From f8b132890cfd1caffc95ac1b438c8e2a7f7a3c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Sat, 27 Nov 2021 00:06:50 +0100 Subject: [PATCH] Add verbose mode to lotus-miner pieces list-cids --- cmd/lotus-miner/pieces.go | 54 ++++++++++++++++++++++++++++- documentation/en/cli-lotus-miner.md | 3 +- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/cmd/lotus-miner/pieces.go b/cmd/lotus-miner/pieces.go index 75605c1ed..778f8e6cf 100644 --- a/cmd/lotus-miner/pieces.go +++ b/cmd/lotus-miner/pieces.go @@ -6,6 +6,7 @@ import ( "text/tabwriter" lcli "github.com/filecoin-project/lotus/cli" + "github.com/filecoin-project/lotus/lib/tablewriter" "github.com/ipfs/go-cid" "github.com/urfave/cli/v2" ) @@ -48,6 +49,12 @@ var piecesListPiecesCmd = &cli.Command{ var piecesListCidInfosCmd = &cli.Command{ Name: "list-cids", Usage: "list registered payload CIDs", + Flags: []cli.Flag{ + &cli.BoolFlag{ + Name: "verbose", + Aliases: []string{"v"}, + }, + }, Action: func(cctx *cli.Context) error { nodeApi, closer, err := lcli.GetMarketsAPI(cctx) if err != nil { @@ -61,9 +68,54 @@ var piecesListCidInfosCmd = &cli.Command{ return err } + w := tablewriter.New(tablewriter.Col("CID"), + tablewriter.Col("Piece"), + tablewriter.Col("BlockOffset"), + tablewriter.Col("BlockLen"), + tablewriter.Col("Deal"), + tablewriter.Col("Sector"), + tablewriter.Col("DealOffset"), + tablewriter.Col("DealLen"), + ) + for _, c := range cids { - fmt.Println(c) + if !cctx.Bool("verbose") { + fmt.Println(c) + continue + } + + ci, err := nodeApi.PiecesGetCIDInfo(ctx, c) + if err != nil { + fmt.Printf("Error getting CID info: %s\n", err) + continue + } + + for _, location := range ci.PieceBlockLocations { + pi, err := nodeApi.PiecesGetPieceInfo(ctx, location.PieceCID) + if err != nil { + fmt.Printf("Error getting piece info: %s\n", err) + continue + } + + for _, deal := range pi.Deals { + w.Write(map[string]interface{}{ + "CID": c, + "Piece": location.PieceCID, + "BlockOffset": location.RelOffset, + "BlockLen": location.BlockSize, + "Deal": deal.DealID, + "Sector": deal.SectorID, + "DealOffset": deal.Offset, + "DealLen": deal.Length, + }) + } + } } + + if cctx.Bool("verbose") { + return w.Flush(os.Stdout) + } + return nil }, } diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md index bc039d743..9ae36b617 100644 --- a/documentation/en/cli-lotus-miner.md +++ b/documentation/en/cli-lotus-miner.md @@ -1460,7 +1460,8 @@ USAGE: lotus-miner pieces list-cids [command options] [arguments...] OPTIONS: - --help, -h show help (default: false) + --verbose, -v (default: false) + --help, -h show help (default: false) ```