fix: recursive directory filtering in ShouldExclude

crackcomm · lidel · commit 8f6e3bd21375 · 2024-03-26T15:47:37.000+01:00
Ensure ignore rule `bar/` matches directories by appending `/`.
Addresses issue where `bar/` didn't catch directories.
After this change, both `bar` and `bar/` rules filter out the `bar` directory
and its contents.
diff --git a/files/filter.go b/files/filter.go
@@ -1,6 +1,7 @@
 package files
 
 import (
+	"fmt"
 	"os"
 
 	ignore "github.com/crackcomm/go-gitignore"
@@ -45,5 +46,8 @@ func (filter *Filter) ShouldExclude(fileInfo os.FileInfo) (result bool) {
 	if !filter.IncludeHidden && isHidden(fileInfo) {
 		return true
 	}
+	if fileInfo.IsDir() {
+		path = fmt.Sprintf("%s/", path)
+	}
 	return filter.Rules.MatchesPath(path)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package files`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "fmt"`
`4`	`5`	`"os"`
`5`	`6`
`6`	`7`	`ignore "github.com/crackcomm/go-gitignore"`
`@@ -45,5 +46,8 @@ func (filter *Filter) ShouldExclude(fileInfo os.FileInfo) (result bool) {`
`45`	`46`	`if !filter.IncludeHidden && isHidden(fileInfo) {`
`46`	`47`	`return true`
`47`	`48`	`}`
	`49`	`+ if fileInfo.IsDir() {`
	`50`	`+ path = fmt.Sprintf("%s/", path)`
	`51`	`+ }`
`48`	`52`	`return filter.Rules.MatchesPath(path)`
`49`	`53`	`}`