From 8ae8ca6667a82df06f80c4253e38fdbd896d485e Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Sat, 31 Mar 2018 02:54:50 -0700 Subject: [PATCH] fmt padding Former-commit-id: d6ce6342bb4cdee028b53c6c35d6a2f66d71729e [formerly d6ce6342bb4cdee028b53c6c35d6a2f66d71729e [formerly ff75ec5b5a00dd0610ff05af8da80b54e4b7856f [formerly 6703cd88ea312711e71b9abb7e5541779594284c]]] Former-commit-id: ee18e66c95b60e95b36237f82c7036c0352a2e62 Former-commit-id: d857bda4ceecd5403c66f5dfb1d4f89cfb76640e [formerly 6284baec0312a6f922585075560739b520fdbccc] Former-commit-id: ddbe1437820aa6bc92d2428eacb8c1800c28ad30 --- cointop/layout.go | 4 ++-- cointop/table.go | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cointop/layout.go b/cointop/layout.go index f882291..54429c1 100644 --- a/cointop/layout.go +++ b/cointop/layout.go @@ -39,8 +39,8 @@ func (ct *Cointop) layout(g *gocui.Gui) error { } t := table.New().SetWidth(maxX) headers := []string{ - pad.Right("[r]ank", 13, " "), - pad.Right("[n]ame", 13, " "), + pad.Right("[r]ank", 7, " "), + pad.Right("[n]ame", 22, " "), pad.Right("[s]ymbol", 8, " "), pad.Left("[p]rice", 13, " "), pad.Left("[m]arket cap", 17, " "), diff --git a/cointop/table.go b/cointop/table.go index 58c0a83..b78192a 100644 --- a/cointop/table.go +++ b/cointop/table.go @@ -9,7 +9,6 @@ import ( humanize "github.com/dustin/go-humanize" apitypes "github.com/miguelmota/cointop/pkg/api/types" "github.com/miguelmota/cointop/pkg/color" - "github.com/miguelmota/cointop/pkg/pad" "github.com/miguelmota/cointop/pkg/table" ) @@ -58,21 +57,21 @@ func (ct *Cointop) updateTable() error { lastchar := len(name) if lastchar > 20 { lastchar = 20 - name = fmt.Sprintf("%s...", name[0:17]) + name = fmt.Sprintf("%s...", name[0:18]) } ct.table.AddRow( - pad.Left(fmt.Sprint(coin.Rank), 4, " "), - pad.Right(" "+string(name), 22, " "), - pad.Right(coin.Symbol, 6, " "), - colorprice(pad.Left(humanize.Commaf(coin.PriceUSD), 12, " ")), - pad.Left(humanize.Commaf(coin.MarketCapUSD), 17, " "), - pad.Left(humanize.Commaf(coin.USD24HVolume), 15, " "), - color1h(pad.Left(fmt.Sprintf("%.2f%%", coin.PercentChange1H), 9, " ")), - color24h(pad.Left(fmt.Sprintf("%.2f%%", coin.PercentChange24H), 9, " ")), - color7d(pad.Left(fmt.Sprintf("%.2f%%", coin.PercentChange7D), 9, " ")), - pad.Left(humanize.Commaf(coin.TotalSupply), 20, " "), - pad.Left(humanize.Commaf(coin.AvailableSupply), 18, " "), - pad.Left(fmt.Sprintf("%s", lastUpdated), 18, " "), + fmt.Sprintf("%6v ", coin.Rank), + fmt.Sprintf("%.22s", name), + fmt.Sprintf("%.6s", coin.Symbol), + colorprice(fmt.Sprintf("%12s", humanize.Commaf(coin.PriceUSD))), + fmt.Sprintf("%17s", humanize.Commaf(coin.MarketCapUSD)), + fmt.Sprintf("%15s", humanize.Commaf(coin.USD24HVolume)), + color1h(fmt.Sprintf("%8.2f%%", coin.PercentChange1H)), + color24h(fmt.Sprintf("%8.2f%%", coin.PercentChange24H)), + color7d(fmt.Sprintf("%8.2f%%", coin.PercentChange7D)), + fmt.Sprintf("%20s", humanize.Commaf(coin.TotalSupply)), + fmt.Sprintf("%18s", humanize.Commaf(coin.AvailableSupply)), + fmt.Sprintf("%18s", lastUpdated), // add %percent of cap ) }