feat: Add SkipDenied option to reader listing functions

pardnchiu · pardnchiu · commit 2fb2e2d443d8 · 2026-06-08T18:34:44.000+08:00
diff --git a/filesystem/reader/globFiles.go b/filesystem/reader/globFiles.go
@@ -27,6 +27,7 @@ func GlobFiles(root, namePattern string) ([]File, error) {
 		}
 		walked, err := WalkFiles(root, ListOption{
 			SkipExcluded:      true,
+			SkipDenied:        true,
 			IgnoreWalkError:   true,
 			IncludeNonRegular: true,
 		})
diff --git a/filesystem/reader/reader.go b/filesystem/reader/reader.go
@@ -7,6 +7,7 @@ import (
 
 type ListOption struct {
 	SkipExcluded      bool
+	SkipDenied        bool
 	IgnoreWalkError   bool
 	IncludeNonRegular bool
 }
diff --git a/filesystem/reader/searchFiles.go b/filesystem/reader/searchFiles.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"log/slog"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -47,7 +46,6 @@ func SearchFiles(root, namePattern string, filePatterns []string, maxSize int64,
 	err = filepath.WalkDir(root, func(path string, d os.DirEntry, err error) error {
 		if err != nil {
 			if opt.IgnoreWalkError {
-				slog.Warn("filepath.WalkDir", slog.String("error", err.Error()))
 				return nil
 			}
 			return err
@@ -66,6 +64,9 @@ func SearchFiles(root, namePattern string, filePatterns []string, maxSize int64,
 		}
 
 		if d.IsDir() {
+			if opt.SkipDenied && filesystem.IsDenied(path) {
+				return filepath.SkipDir
+			}
 			if opt.SkipExcluded {
 				abs, err := filepath.Abs(path)
 				if err != nil {
diff --git a/filesystem/reader/walkFiles.go b/filesystem/reader/walkFiles.go
@@ -35,6 +35,9 @@ func WalkFiles(root string, opts ...ListOption) ([]File, error) {
 			if strings.HasPrefix(entry.Name(), ".") {
 				return filepath.SkipDir
 			}
+			if opt.SkipDenied && filesystem.IsDenied(path) {
+				return filepath.SkipDir
+			}
 			if opt.SkipExcluded {
 				abs, err := filepath.Abs(path)
 				if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func GlobFiles(root, namePattern string) ([]File, error) {`
`27`	`27`	`}`
`28`	`28`	`walked, err := WalkFiles(root, ListOption{`
`29`	`29`	`SkipExcluded: true,`
	`30`	`+ SkipDenied: true,`
`30`	`31`	`IgnoreWalkError: true,`
`31`	`32`	`IncludeNonRegular: true,`
`32`	`33`	`})`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`type ListOption struct {`
`9`	`9`	`SkipExcluded bool`
	`10`	`+ SkipDenied bool`
`10`	`11`	`IgnoreWalkError bool`
`11`	`12`	`IncludeNonRegular bool`
`12`	`13`	`}`