Improve globbing to better handle both patterns and non patterns

.gitignore

@@ -2,3 +2,4 @@
 *.exe
 cln
 cln.log
+.qodo

go.mod

@@ -3,3 +3,5 @@ module cln
 go 1.21.7
 
 require gopkg.in/yaml.v3 v3.0.1
+
+require github.com/bmatcuk/doublestar/v4 v4.8.1

go.sum

@@ -1,3 +1,5 @@
+github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
+github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

instruction.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/bmatcuk/doublestar/v4"
 	"gopkg.in/yaml.v3"
 )
 
@@ -283,11 +284,10 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
 
 	expanded := []LinkInstruction{}
 	for _, link := range config.Links {
-		if strings.Contains(link.Source, "*") {
+		LogSource("Expanding pattern source %s in YAML file %s", link.Source, filename)
-			LogSource("Expanding wildcard source %s in YAML file %s", link.Source, filename)
+		newlinks, err := ExpandPattern(link.Source, workdir, link.Target)
-			newlinks, err := ExpandWildcard(link.Source, workdir, link.Target)
 		if err != nil {
-				return nil, fmt.Errorf("error expanding wildcard: %w", err)
+			return nil, fmt.Errorf("error expanding pattern: %w", err)
 		}
 		// "Clone" the original link instruction for each expanded link
 		for i := range newlinks {
@@ -295,12 +295,9 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
 			newlinks[i].Hard = link.Hard
 			newlinks[i].Force = link.Force
 		}
-			LogInfo("Expanded wildcard source %s in YAML file %s to %d links",
+		LogInfo("Expanded pattern %s in YAML file %s to %d links",
 			FormatSourcePath(link.Source), FormatSourcePath(filename), len(newlinks))
 		expanded = append(expanded, newlinks...)
-		} else {
-			expanded = append(expanded, link)
-		}
 	}
 
 	for i := range expanded {
@@ -321,24 +318,61 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
 	return expanded, nil
 }
 
-func ExpandWildcard(source, workdir, target string) (links []LinkInstruction, err error) {
+func ExpandPattern(source, workdir, target string) (links []LinkInstruction, err error) {
-	dir := filepath.Dir(source)
+	static, pattern := doublestar.SplitPattern(source)
-	pattern := filepath.Base(source)
+	if static == "" {
+		static = workdir
+	}
+	LogInfo("Static part: %s", static)
+	LogInfo("Pattern part: %s", pattern)
 
-	files, err := filepath.Glob(filepath.Join(workdir, dir, pattern))
+	files, err := doublestar.Glob(os.DirFS(static), pattern)
 	if err != nil {
-		return nil, fmt.Errorf("error expanding wildcard: %w", err)
+		return nil, fmt.Errorf("error expanding pattern: %w", err)
+	}
+
+	targetIsFile := false
+	if info, err := os.Stat(target); err == nil && !info.IsDir() {
+		targetIsFile = true
 	}
 
 	for _, file := range files {
-		link := LinkInstruction{
+		if info, err := os.Stat(file); err == nil && info.IsDir() {
-			Source: file,
+			// We don't care about matched directories
-			Target: filepath.Join(target, filepath.Base(file)),
+			// We want files within them
+			if len(files) == 1 {
+				// Special case: if there is only one file, and it's a directory
+				// This should only ever happen if our source is a path (and not a glob!)
+				// And our target is a path, a directory
+				// ...but it will also happen if the source IS a glob and it happens to match ONE directory
+				// I think that should happen rarely enough to not be an issue...
+				links = append(links, LinkInstruction{
+					Source: filepath.Join(static, file),
+					Target: target,
+				})
+				continue
 			}
-		links = append(links, link)
+			LogInfo("Skipping directory %s", file)
+			continue
 		}
 
-	LogInfo("Expanded wildcard source %s to %d links", FormatSourcePath(source), len(links))
+		var targetPath string
+		if targetIsFile && len(files) == 1 {
+			// Special case: target is a file, and glob matches exactly one file.
+			// Use target directly (don't append filename).
+			targetPath = target
+		} else {
+			// Default: append filename to target dir.
+			targetPath = filepath.Join(target, file)
+		}
+
+		links = append(links, LinkInstruction{
+			Source: filepath.Join(static, file),
+			Target: targetPath,
+		})
+	}
+
+	LogInfo("Expanded pattern %s to %d links", FormatSourcePath(source), len(links))
 	return
 }
 

main.go

@@ -62,9 +62,9 @@ func main() {
 		LogInfo("Reading from command line arguments")
 		go ReadFromArgs(instructions, status)
 
-	case IsPipeInput():
+	// case IsPipeInput():
-		LogInfo("Reading from stdin pipe")
+	// 	LogInfo("Reading from stdin pipe")
-		go ReadFromStdin(instructions, status)
+	// 	go ReadFromStdin(instructions, status)
 
 	default:
 		if _, err := os.Stat("sync"); err == nil {

sync.yaml

@@ -1,2 +1,6 @@
-- source: \*
+- source: A/**/*
-  target: test/
+  target: B
+- source: A/go.mod
+  target: B/go.mod
+- source: A
+  target: B/foo