Skip to content

Commit 08397a5

Browse files
Mmx233Mmx233
committed
improve: use logrus instead of log
1 parent f77bdda commit 08397a5

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

‎cmd/code/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/Mmx233/CodeCli/internal/pkg/browser"
66
"github.com/Mmx233/CodeCli/internal/pkg/config"
77
"github.com/Mmx233/CodeCli/internal/pkg/project"
8-
"log"
8+
log "github.com/sirupsen/logrus"
99
"os"
1010
)
1111

‎go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ require (
77
github.com/Mmx233/tool v0.7.7
88
github.com/alecthomas/kingpin/v2 v2.4.0
99
github.com/mitchellh/go-homedir v1.1.0
10+
github.com/sirupsen/logrus v1.9.3
1011
gopkg.in/yaml.v3 v3.0.1
1112
)
1213

1314
require (
1415
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
1516
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
17+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
1618
)

‎go.sum

+6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
1313
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
1414
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1515
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
16+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
17+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
1618
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1719
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
20+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1821
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
1922
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
2023
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
2124
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
25+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
26+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2227
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
2328
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2429
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
30+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2531
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2632
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎internal/global/config.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/Mmx233/CodeCli/pkg/file"
77
"github.com/Mmx233/config"
88
"github.com/mitchellh/go-homedir"
9-
"log"
9+
log "github.com/sirupsen/logrus"
1010
"os"
1111
)
1212

@@ -59,14 +59,14 @@ func init() {
5959
})
6060
if err = ConfigLoader.Load(); err != nil {
6161
if errors.Is(err, config.IsNewConfig) {
62-
log.Println(err.Error())
62+
log.Infoln(err.Error())
6363
os.Exit(0)
6464
} else {
6565
log.Fatalln(err)
6666
}
6767
}
6868

6969
if len(Config.Rules) == 0 {
70-
log.Println("Warn: no match rule found")
70+
log.Warnln("no match rule found")
7171
}
7272
}

‎internal/pkg/project/clear.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"github.com/Mmx233/CodeCli/internal/global"
66
"github.com/Mmx233/CodeCli/pkg/file"
7-
"log"
7+
log "github.com/sirupsen/logrus"
88
"os"
99
"strings"
1010
"time"
@@ -22,7 +22,7 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
2222
var project *Project
2323
project, err = CompleteAddrToProject(addr)
2424
if err != nil {
25-
log.Printf("warning: addr %s occur error: %v\n", addr, err)
25+
log.Warnf("warning: addr %s occur error: %v\n", addr, err)
2626
continue
2727
}
2828
projectPaths = append(projectPaths, project.Path)
@@ -59,18 +59,18 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
5959
for _, path := range projectPaths {
6060
isClean, err = IsRepoClean(path)
6161
if err != nil {
62-
log.Printf("warning: %s isn't a git repo: %v.", path, err)
62+
log.Warnf("%s isn't a git repo: %v.", path, err)
6363
continue
6464
} else if !isClean {
65-
log.Printf("warning: %s should be cleared, but there are local changes.", path)
65+
log.Warnf("%s should be cleared, but there are local changes.", path)
6666
} else {
6767
projectPure = append(projectPure, path)
6868
}
6969
}
7070
projectPaths = projectPure
7171
}
7272
if len(projectPaths) != 0 {
73-
log.Println("info: following projects is going to be cleared.")
73+
log.Infoln("following projects is going to be cleared.")
7474
fmt.Println(strings.Join(projectPaths, "\n"))
7575

7676
if !yes && !force {
@@ -89,9 +89,9 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
8989
log.Printf("warning: remove project %s failed: %v", path, err)
9090
}
9191
}
92-
log.Println("info: clean task completed.")
92+
log.Infoln("clean task completed.")
9393
} else {
94-
log.Println("info: no project to clear.")
94+
log.Infoln("no project to clear.")
9595
}
9696
return nil
9797
}

0 commit comments

Comments
 (0)