@@ -16,14 +16,16 @@ func dirShouldScan(file os.FileInfo) bool {
1616}
1717
1818func Clear (t time.Duration , yes , force bool , addresses ... string ) error {
19+ logger := log .WithField ("component" , "clear" )
20+
1921 var projectPaths []string
2022 var err error
2123 if len (addresses ) != 0 {
2224 for _ , addr := range addresses {
2325 var project * Project
2426 project , err = CompleteAddrToProject (addr )
2527 if err != nil {
26- log .Warnf ("warning: addr %s occur error: %v\n " , addr , err )
28+ logger .Warnf ("addr %s occur error: %v" , addr , err )
2729 continue
2830 }
2931 projectPaths = append (projectPaths , project .Path )
@@ -60,18 +62,18 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
6062 for _ , projectPath := range projectPaths {
6163 isClean , err = IsRepoClean (projectPath )
6264 if err != nil {
63- log .Warnf ("%s isn't a git repo: %v." , projectPath , err )
65+ logger .Warnf ("%s isn't a git repo: %v." , projectPath , err )
6466 continue
6567 } else if ! isClean {
66- log .Warnf ("%s should be cleared, but there are local changes." , projectPath )
68+ logger .Warnf ("%s should be cleared, but there are local changes." , projectPath )
6769 } else {
6870 projectPure = append (projectPure , projectPath )
6971 }
7072 }
7173 projectPaths = projectPure
7274 }
7375 if len (projectPaths ) != 0 {
74- log .Infoln ("following projects is going to be cleared." )
76+ logger .Infoln ("following projects is going to be cleared." )
7577 fmt .Println (strings .Join (projectPaths , "\n " ))
7678
7779 if ! yes && ! force {
@@ -85,14 +87,14 @@ func Clear(t time.Duration, yes, force bool, addresses ...string) error {
8587 }
8688 }
8789
88- for _ , path := range projectPaths {
89- if err = os .RemoveAll (path ); err != nil {
90- log . Printf ( "warning: remove project %s failed: %v" , path , err )
90+ for _ , projectPath := range projectPaths {
91+ if err = os .RemoveAll (projectPath ); err != nil {
92+ logger . Warnf ( " remove project %s failed: %v" , projectPath , err )
9193 }
9294 }
93- log .Infoln ("clean task completed." )
95+ logger .Infoln ("clean task completed." )
9496 } else {
95- log .Infoln ("no project to clear." )
97+ logger .Infoln ("no project to clear." )
9698 }
9799 return nil
98100}
0 commit comments