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

Enable color by default only if os.Stdout is a TTY

Browse Source
This commit is contained in:
Peter Rabbitson 2021-07-07 18:12:17 +02:00
parent 49896afe9f
commit c7bb326c78
9 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/client.go
View File

@ -45,6 +45,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/builtin"
"github.com/filecoin-project/lotus/chain/actors/builtin/market"
"github.com/filecoin-project/lotus/chain/types"
cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/lib/tablewriter"
)
@ -1233,7 +1234,7 @@ var clientListRetrievalsCmd = &cli.Command{
&cli.BoolFlag{
Name: "color",
Usage: "use color in display output",
Value: true,
Value: cliutil.DefaultColorUse,
},
&cli.BoolFlag{
Name: "show-failed",
@ -1806,7 +1807,7 @@ var clientListDeals = &cli.Command{
&cli.BoolFlag{
Name: "color",
Usage: "use color in display output",
Value: true,
Value: cliutil.DefaultColorUse,
},
&cli.BoolFlag{
Name: "show-failed",
@ -2336,7 +2337,7 @@ var clientListTransfers = &cli.Command{
&cli.BoolFlag{
Name: "color",
Usage: "use color in display output",
Value: true,
Value: cliutil.DefaultColorUse,
},
&cli.BoolFlag{
Name: "completed",

9
cli/util/color.go Normal file
View File

@ -0,0 +1,9 @@
package cliutil
import (
"os"
"github.com/mattn/go-isatty"
)
var DefaultColorUse = isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd())

3
cmd/lotus-shed/actor.go
View File

@ -20,6 +20,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/lib/tablewriter"
)
@ -266,7 +267,7 @@ var actorControlList = &cli.Command{
},
&cli.BoolFlag{
Name: "color",
Value: true,
Value: cliutil.DefaultColorUse,
},
},
Action: func(cctx *cli.Context) error {

3
cmd/lotus-storage-miner/actor.go
View File

@ -26,6 +26,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/lib/tablewriter"
)
@ -389,7 +390,7 @@ var actorControlList = &cli.Command{
},
&cli.BoolFlag{
Name: "color",
Value: true,
Value: cliutil.DefaultColorUse,
},
},
Action: func(cctx *cli.Context) error {

4
cmd/lotus-storage-miner/main.go
View File

@ -13,6 +13,7 @@ import (
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/lib/lotuslog"
"github.com/filecoin-project/lotus/lib/tracing"
"github.com/filecoin-project/lotus/node/repo"
@ -81,7 +82,8 @@ func main() {
Aliases: []string{"a"},
},
&cli.BoolFlag{
Name: "color",
Name: "color",
Value: cliutil.DefaultColorUse,
},
&cli.StringFlag{
Name: "repo",

3
cmd/lotus-storage-miner/market.go
View File

@ -30,6 +30,7 @@ import (
"github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
)
var CidBaseFlag = cli.StringFlag{
@ -754,7 +755,7 @@ var transfersListCmd = &cli.Command{
&cli.BoolFlag{
Name: "color",
Usage: "use color in display output",
Value: true,
Value: cliutil.DefaultColorUse,
},
&cli.BoolFlag{
Name: "completed",

11
cmd/lotus-storage-miner/sealing.go
View File

@ -19,6 +19,7 @@ import (
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
)
var sealingCmd = &cli.Command{
@ -36,7 +37,10 @@ var sealingWorkersCmd = &cli.Command{
Name: "workers",
Usage: "list workers",
Flags: []cli.Flag{
&cli.BoolFlag{Name: "color"},
&cli.BoolFlag{
Name: "color",
Value: cliutil.DefaultColorUse,
},
},
Action: func(cctx *cli.Context) error {
color.NoColor = !cctx.Bool("color")
@ -127,7 +131,10 @@ var sealingJobsCmd = &cli.Command{
Name: "jobs",
Usage: "list running jobs",
Flags: []cli.Flag{
&cli.BoolFlag{Name: "color"},
&cli.BoolFlag{
Name: "color",
Value: cliutil.DefaultColorUse,
},
&cli.BoolFlag{
Name: "show-ret-done",
Usage: "show returned but not consumed calls",

3
cmd/lotus-storage-miner/sectors.go
View File

@ -26,6 +26,7 @@ import (
"github.com/filecoin-project/lotus/lib/tablewriter"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
)
@ -163,7 +164,7 @@ var sectorsListCmd = &cli.Command{
&cli.BoolFlag{
Name: "color",
Aliases: []string{"c"},
Value: true,
Value: cliutil.DefaultColorUse,
},
&cli.BoolFlag{
Name: "fast",

8
cmd/lotus-storage-miner/storage.go
View File

@ -27,6 +27,7 @@ import (
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli"
cliutil "github.com/filecoin-project/lotus/cli/util"
"github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/extern/sector-storage/storiface"
@ -166,7 +167,10 @@ var storageListCmd = &cli.Command{
Name: "list",
Usage: "list local storage paths",
Flags: []cli.Flag{
&cli.BoolFlag{Name: "color"},
&cli.BoolFlag{
Name: "color",
Value: cliutil.DefaultColorUse,
},
},
Subcommands: []*cli.Command{
storageListSectorsCmd,
@ -479,7 +483,7 @@ var storageListSectorsCmd = &cli.Command{
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "color",
Value: true,
Value: cliutil.DefaultColorUse,
},
},
Action: func(cctx *cli.Context) error {