Implement doublestar wildcards

This commit is contained in:
2025-04-13 19:28:57 +02:00
parent 3a5a333c62
commit 78536c3e19
6 changed files with 30 additions and 11 deletions

1
.gitignore vendored
View File

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

2
go.mod
View File

@@ -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

2
go.sum
View File

@@ -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=

View File

@@ -6,6 +6,7 @@ import (
"path/filepath"
"strings"
"github.com/bmatcuk/doublestar/v4"
"gopkg.in/yaml.v3"
)
@@ -285,7 +286,7 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
for _, link := range config.Links {
if strings.Contains(link.Source, "*") {
LogSource("Expanding wildcard source %s in YAML file %s", link.Source, filename)
newlinks, err := ExpandWildcard(link.Source, workdir, link.Target)
newlinks, err := ExpandPattern(link.Source, workdir, link.Target)
if err != nil {
return nil, fmt.Errorf("error expanding wildcard: %w", err)
}
@@ -321,19 +322,32 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
return expanded, nil
}
func ExpandWildcard(source, workdir, target string) (links []LinkInstruction, err error) {
dir := filepath.Dir(source)
pattern := filepath.Base(source)
func ExpandPattern(source, workdir, target string) (links []LinkInstruction, err error) {
static, pattern := doublestar.SplitPattern(source)
if static == "" {
cwd, err := os.Getwd()
if err != nil {
return nil, fmt.Errorf("error getting current working directory: %w", err)
}
static = cwd
}
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)
}
for _, file := range files {
ext := filepath.Ext(file)
if ext == "" {
LogInfo("Skipping file %s because it has no extension (Directory?)", file)
continue
}
link := LinkInstruction{
Source: file,
Target: filepath.Join(target, filepath.Base(file)),
Target: filepath.Join(target, file),
}
links = append(links, link)
}

View File

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

View File

@@ -1,2 +1,2 @@
- source: \*
target: test/
- source: A/**/*
target: B