diff options
author | Daniel Milde <daniel.milde@firma.seznam.cz> | 2021-01-20 09:29:17 +0100 |
---|---|---|
committer | Daniel Milde <daniel.milde@firma.seznam.cz> | 2021-01-20 09:29:17 +0100 |
commit | caaac6de68871240cf54c4d34c9c104d87dd44a9 (patch) | |
tree | 63b883de13da0c58cba730342aa04ff3dc9abf05 | |
parent | 149b3f71e996a5fc4e1306b49e88bf2e8c8458f4 (diff) |
use github.com/fatih/color instead of github.com/gookit/colorv4.2.0
-rw-r--r-- | go.mod | 2 | ||||
-rw-r--r-- | go.sum | 4 | ||||
-rw-r--r-- | stdout/stdout.go | 16 |
3 files changed, 11 insertions, 11 deletions
@@ -3,8 +3,8 @@ module github.com/dundee/gdu go 1.15 require ( + github.com/fatih/color v1.7.0 github.com/gdamore/tcell/v2 v2.1.0 - github.com/gookit/color v1.3.6 github.com/mattn/go-isatty v0.0.12 github.com/rivo/tview v0.0.0-20201204190810-5406288b8e4e github.com/spf13/cobra v1.1.1 @@ -36,6 +36,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= @@ -69,8 +70,6 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gookit/color v1.3.6 h1:Rgbazd4JO5AgSTVGS3o0nvaSdwdrS8bzvIXwtK6OiMk= -github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -115,6 +114,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= diff --git a/stdout/stdout.go b/stdout/stdout.go index fbdb38d..4b39d8c 100644 --- a/stdout/stdout.go +++ b/stdout/stdout.go @@ -10,7 +10,7 @@ import ( "time" "github.com/dundee/gdu/analyze" - "github.com/gookit/color" + "github.com/fatih/color" ) // UI struct @@ -19,9 +19,9 @@ type UI struct { ignoreDirPaths map[string]bool useColors bool showProgress bool - red color.Style - orange color.Style - blue color.Style + red *color.Color + orange *color.Color + blue *color.Color } // CreateStdoutUI creates UI for stdout @@ -32,12 +32,12 @@ func CreateStdoutUI(output io.Writer, useColors bool, showProgress bool) *UI { showProgress: showProgress, } - ui.red = color.Style{color.FgRed, color.OpBold} - ui.orange = color.Style{color.FgYellow, color.OpBold} - ui.blue = color.Style{color.FgBlue, color.OpBold} + ui.red = color.New(color.FgRed).Add(color.Bold) + ui.orange = color.New(color.FgYellow).Add(color.Bold) + ui.blue = color.New(color.FgBlue).Add(color.Bold) if !useColors { - color.Disable() + color.NoColor = true } return ui |