cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #3295 from filecoin-project/fix/use-safe-ellipsis-for-cli-output

Browse Source 
Use a safe string ellipsis/truncation function for client CLI output
This commit is contained in:
Whyrusleeping 2020-08-25 12:50:27 -07:00 committed by GitHub
commit 2bf8fb8c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cli/client.go
View File

@ -1060,8 +1060,7 @@ var clientListDeals = &cli.Command{
tablewriter.NewLineCol("Message")) tablewriter.NewLineCol("Message"))
for _, d := range deals { for _, d := range deals {
propcid := d.LocalDeal.ProposalCid.String() propcid := ellipsis(d.LocalDeal.ProposalCid.String(), 8)
propcid = "..." + propcid[len(propcid)-8:]
onChain := "N" onChain := "N"
if d.OnChainDealState.SectorStartEpoch != -1 { if d.OnChainDealState.SectorStartEpoch != -1 {
@ -1073,8 +1072,7 @@ var clientListDeals = &cli.Command{
slashed = fmt.Sprintf("Y (epoch %d)", d.OnChainDealState.SlashEpoch) slashed = fmt.Sprintf("Y (epoch %d)", d.OnChainDealState.SlashEpoch)
} }
piece := d.LocalDeal.PieceCID.String() piece := ellipsis(d.LocalDeal.PieceCID.String(), 8)
piece = "..." + piece[len(piece)-8:]
price := types.FIL(types.BigMul(d.LocalDeal.PricePerEpoch, types.NewInt(d.LocalDeal.Duration))) price := types.FIL(types.BigMul(d.LocalDeal.PricePerEpoch, types.NewInt(d.LocalDeal.Duration)))
@ -1352,11 +1350,8 @@ func channelStatusString(useColor bool, status datatransfer.Status) string {
} }
func toChannelOutput(useColor bool, otherPartyColumn string, channel lapi.DataTransferChannel) map[string]interface{} { func toChannelOutput(useColor bool, otherPartyColumn string, channel lapi.DataTransferChannel) map[string]interface{} {
rootCid := channel.BaseCID.String() rootCid := ellipsis(channel.BaseCID.String(), 8)
rootCid = "..." + rootCid[len(rootCid)-8:] otherParty := ellipsis(channel.OtherPeer.String(), 8)
otherParty := channel.OtherPeer.String()
otherParty = "..." + otherParty[len(otherParty)-8:]
initiated := "N" initiated := "N"
if channel.IsInitiator { if channel.IsInitiator {
@ -1365,7 +1360,7 @@ func toChannelOutput(useColor bool, otherPartyColumn string, channel lapi.DataTr
voucher := channel.Voucher voucher := channel.Voucher
if len(voucher) > 40 { if len(voucher) > 40 {
voucher = "..." + voucher[len(voucher)-37:] voucher = ellipsis(voucher, 37)
} }
return map[string]interface{}{ return map[string]interface{}{
@ -1379,3 +1374,10 @@ func toChannelOutput(useColor bool, otherPartyColumn string, channel lapi.DataTr
"Message": channel.Message, "Message": channel.Message,
} }
} }
func ellipsis(s string, length int) string {
if length > 0 && len(s) > length {
return "..." + s[len(s)-length:]
}
return s
}