Filesystem improvements

kyleu · Dec 14, 2024 · fd34f2c · fd34f2c
1 parent 1d87759
commit fd34f2c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/app/lib/filesystem/fileloader.go b/app/lib/filesystem/fileloader.go
@@ -20,7 +20,7 @@ type FileLoader interface {
 	CopyRecursive(src string, tgt string, ignore []string, logger util.Logger) error
 	Move(src string, tgt string) error
 	ListFiles(path string, ignore []string, logger util.Logger) FileInfos
-	ListFilesRecursive(path string, ignore []string, logger util.Logger) ([]string, error)
+	ListFilesRecursive(path string, ignore []string, logger util.Logger, patterns ...string) ([]string, error)
 	ListTree(cfg util.ValueMap, path string, ignore []string, logger util.Logger, tags ...string) (*Tree, error)
 	ListJSON(path string, ignore []string, trimExtension bool, logger util.Logger) []string
 	ListExtension(path string, ext string, ignore []string, trimExtension bool, logger util.Logger) []string

diff --git a/app/lib/filesystem/fsignore.go b/app/lib/filesystem/fsignore.go
@@ -18,28 +18,42 @@ func buildIgnore(ign []string) []string {
 }
 
 const (
-	keyPrefix = "^"
-	keySuffix = "$"
+	keyPrefix   = "^"
+	keySuffix   = "$"
+	keyWildcard = "*"
 )
 
 func checkIgnore(ignore []string, fp string) bool {
 	for _, i := range ignore {
-		switch {
-		case strings.HasPrefix(i, keyPrefix):
-			i = strings.TrimPrefix(i, keyPrefix)
+		if fp == i {
+			return true
+		}
+		if strings.HasPrefix(i, keyWildcard) && strings.HasSuffix(i, keyWildcard) {
+			if strings.Contains(fp, strings.TrimSuffix(strings.TrimPrefix(i, keyWildcard), keyWildcard)) {
+				return true
+			}
+		}
+		if strings.HasPrefix(i, keyPrefix) || strings.HasSuffix(i, keyWildcard) {
+			i = strings.TrimPrefix(strings.TrimSuffix(i, keyWildcard), keyPrefix)
 			if fp == strings.TrimSuffix(i, "/") || fp == strings.TrimSuffix(i, "\\") {
 				return true
 			}
 			if strings.HasPrefix(fp, i) {
 				return true
 			}
-		case strings.HasSuffix(i, keySuffix):
-			if strings.HasSuffix(fp, strings.TrimSuffix(i, keySuffix)) {
+		}
+		if strings.HasSuffix(i, keySuffix) || strings.HasPrefix(i, keyWildcard) {
+			if strings.HasSuffix(fp, strings.TrimSuffix(strings.TrimPrefix(i, keyWildcard), keySuffix)) {
 				return true
 			}
-		case fp == i:
-			return true
 		}
 	}
 	return false
 }
+
+func checkPatterns(patterns []string, pth string) bool {
+	if len(patterns) == 0 {
+		return true
+	}
+	return checkIgnore(patterns, pth)
+}
diff --git a/app/lib/filesystem/fslist.go b/app/lib/filesystem/fslist.go
@@ -58,7 +58,7 @@ func (f *FileSystem) ListDirectories(path string, ign []string, logger util.Logg
 	})
 }
 
-func (f *FileSystem) ListFilesRecursive(path string, ign []string, _ util.Logger) ([]string, error) {
+func (f *FileSystem) ListFilesRecursive(path string, ign []string, _ util.Logger, patterns ...string) ([]string, error) {
 	ignore := buildIgnore(ign)
 	p := f.getPath(path)
 	ret := &util.StringSlice{}
@@ -70,6 +70,9 @@ func (f *FileSystem) ListFilesRecursive(path string, ign []string, _ util.Logger
 		if checkIgnore(ignore, m) {
 			return nil
 		}
+		if !checkPatterns(patterns, m) {
+			return nil
+		}
 		if info != nil && (!info.IsDir()) && (info.Mode()&os.ModeSymlink != os.ModeSymlink) && (strings.Contains(fp, "/") || strings.Contains(fp, "\\")) {
 			ret.Push(m)
 		}