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

fix(cli): cleanup data-transfers

Browse Source 
cleanup output for data transfers.
This commit is contained in:
hannahhoward 2020-08-18 16:43:05 -07:00
parent f511cc188a
commit ef7f7375e7
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cli/client.go
View File

@ -1247,21 +1247,29 @@ var clientListTransfers = &cli.Command{
fmt.Fprintf(os.Stdout, "Sending Channels\n\n") fmt.Fprintf(os.Stdout, "Sending Channels\n\n")
w := tablewriter.New(tablewriter.Col("ID"), w := tablewriter.New(tablewriter.Col("ID"),
tablewriter.Col("Status"), tablewriter.Col("Status"),
tablewriter.Col("Other Party"), tablewriter.Col("Sending To"),
tablewriter.Col("Root Cid"), tablewriter.Col("Root Cid"),
tablewriter.Col("Initiated?"), tablewriter.Col("Initiated?"),
tablewriter.Col("Transferred"), tablewriter.Col("Transferred"),
tablewriter.NewLineCol("Voucher"), tablewriter.Col("Voucher"),
tablewriter.NewLineCol("Message")) tablewriter.NewLineCol("Message"))
for _, channel := range sendingChannels { for _, channel := range sendingChannels {
w.Write(toChannelOutput(color, channel)) w.Write(toChannelOutput(color, "Sending To", channel))
} }
w.Flush(os.Stdout) w.Flush(os.Stdout)
fmt.Fprintf(os.Stdout, "\nReceiving Channels\n\n") fmt.Fprintf(os.Stdout, "\nReceiving Channels\n\n")
w = tablewriter.New(tablewriter.Col("ID"),
tablewriter.Col("Status"),
tablewriter.Col("Receiving From"),
tablewriter.Col("Root Cid"),
tablewriter.Col("Initiated?"),
tablewriter.Col("Transferred"),
tablewriter.Col("Voucher"),
tablewriter.NewLineCol("Message"))
for _, channel := range receivingChannels { for _, channel := range receivingChannels {
w.Write(toChannelOutput(color, channel)) w.Write(toChannelOutput(color, "Receiving From", channel))
} }
return w.Flush(os.Stdout) return w.Flush(os.Stdout)
}, },
@ -1283,7 +1291,7 @@ func channelStatusString(useColor bool, status datatransfer.Status) string {
} }
} }
func toChannelOutput(useColor bool, channel api.DataTransferChannel) map[string]interface{} { func toChannelOutput(useColor bool, otherPartyColumn string, channel api.DataTransferChannel) map[string]interface{} {
rootCid := channel.BaseCID.String() rootCid := channel.BaseCID.String()
rootCid = "..." + rootCid[len(rootCid)-8:] rootCid = "..." + rootCid[len(rootCid)-8:]
@ -1295,14 +1303,19 @@ func toChannelOutput(useColor bool, channel api.DataTransferChannel) map[string]
initiated = "Y" initiated = "Y"
} }
voucher := channel.VoucherJSON
if len(voucher) > 40 {
voucher = "..." + voucher[len(voucher)-37:]
}
return map[string]interface{}{ return map[string]interface{}{
"ID": channel.TransferID, "ID": channel.TransferID,
"Status": channelStatusString(useColor, channel.Status), "Status": channelStatusString(useColor, channel.Status),
"Other Party": otherParty, otherPartyColumn: otherParty,
"Root Cid": rootCid, "Root Cid": rootCid,
"Initiated?": initiated, "Initiated?": initiated,
"Transferred": channel.Transferred, "Transferred": channel.Transferred,
"Voucher": channel.VoucherJSON, "Voucher": voucher,
"Message": channel.Message, "Message": channel.Message,
} }
} }