From 4a3e5818a17fc55e5c6a2065a54b0ed1376e04ca Mon Sep 17 00:00:00 2001 From: amorozov Date: Sun, 30 Jun 2024 01:11:25 +0300 Subject: [PATCH] feature: sub file finders returns file names now --- pkg/io/files/subfile_finder.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkg/io/files/subfile_finder.go b/pkg/io/files/subfile_finder.go index e586aaa..249e55d 100644 --- a/pkg/io/files/subfile_finder.go +++ b/pkg/io/files/subfile_finder.go @@ -11,7 +11,7 @@ import ( type FileFilter func(fileInfo os.FileInfo, fileName string) bool -func ListFiles(dirPath string) (*array_list.ArrayList[os.FileInfo], error) { +func ListFiles(dirPath string) (*array_list.ArrayList[string], error) { dirInfo, err := os.Stat(dirPath) if err != nil { @@ -28,29 +28,23 @@ func ListFiles(dirPath string) (*array_list.ArrayList[os.FileInfo], error) { return nil, err } - result := array_list.NewArrayList[os.FileInfo]() + result := array_list.NewArrayList[string]() if len(dirEntries) > 0 { for _, dirEntry := range dirEntries { - dirEntryFileInfo, err := dirEntry.Info() - - if err != nil { - return nil, err - } - - result.Add(dirEntryFileInfo) + result.Add(dirEntry.Name()) } } return result, nil } -func FindSubFilesByFilter(rootPath string, filter FileFilter) (*array_list.ArrayList[os.FileInfo], error) { - result := array_list.NewArrayList[os.FileInfo]() +func FindSubFilesByFilter(rootPath string, filter FileFilter) (*array_list.ArrayList[string], error) { + result := array_list.NewArrayList[string]() err := filepath.Walk(rootPath, func(path string, info fs.FileInfo, err error) error { if err == nil && filter(info, path) { - result.Add(info) + result.Add(path) } return err