Hallucinate a fix to recurse using doublestar

This commit is contained in:
2025-07-10 20:49:39 +02:00
parent 3f7fd36f84
commit b53628e698
2 changed files with 49 additions and 149 deletions

117
util.go
View File

@@ -5,9 +5,8 @@ import (
"os"
"path/filepath"
"strings"
"sync"
"sync/atomic"
"time"
"github.com/bmatcuk/doublestar/v4"
)
func IsSymlink(path string) (bool, error) {
@@ -76,112 +75,24 @@ func GetSyncFilesRecursively(input string, output chan string, status chan error
defer close(output)
defer close(status)
var filesProcessed int32
var foldersProcessed int32
var activeWorkers int32
workdir, _ := os.Getwd()
input = NormalizePath(input, workdir)
LogInfo("Searching for sync files recursively starting in %s", FormatPathValue(input))
progressTicker := time.NewTicker(200 * time.Millisecond)
defer progressTicker.Stop()
done := make(chan struct{})
defer close(done)
directories := make(chan string, 100000)
workerPool := make(chan struct{}, 4000)
directories <- input
go func() {
for {
select {
case <-progressTicker.C:
dirCount := len(directories)
workers := atomic.LoadInt32(&activeWorkers)
fmt.Printf("\rFiles processed: %d; Folders processed: %d; Active workers: %d; Directory queue: %d",
atomic.LoadInt32(&filesProcessed),
atomic.LoadInt32(&foldersProcessed),
workers,
dirCount)
case <-done:
// Final progress update
fmt.Printf("\nFiles processed: %d; Folders processed: %d; Completed successfully\n",
atomic.LoadInt32(&filesProcessed),
atomic.LoadInt32(&foldersProcessed))
return
}
}
}()
allDone := make(chan struct{})
go func() {
// WTF is this waitgroup?
// Nowhere is it added...
var wg sync.WaitGroup
go func() {
for {
if atomic.LoadInt32(&activeWorkers) == 0 && len(directories) == 0 {
time.Sleep(10 * time.Millisecond)
if atomic.LoadInt32(&activeWorkers) == 0 && len(directories) == 0 {
close(allDone)
return
}
}
time.Sleep(50 * time.Millisecond)
}
}()
for {
select {
case directory, ok := <-directories:
if !ok {
wg.Wait()
return
}
atomic.AddInt32(&activeWorkers, 1)
go func(dir string) {
workerPool <- struct{}{}
atomic.AddInt32(&foldersProcessed, 1)
processDirectory(dir, directories, output, &filesProcessed)
<-workerPool
atomic.AddInt32(&activeWorkers, -1)
}(directory)
}
}
}()
<-allDone
if atomic.LoadInt32(&filesProcessed) > 0 {
LogInfo("Files processed: %d; Folders processed: %d",
atomic.LoadInt32(&filesProcessed),
atomic.LoadInt32(&foldersProcessed))
}
}
func processDirectory(directory string, directories chan<- string, output chan<- string, filesProcessed *int32) {
files, err := os.ReadDir(directory)
// Use doublestar to find all sync.yml and sync.yaml files recursively
pattern := "**/sync.y*ml"
files, err := doublestar.Glob(os.DirFS(input), pattern)
if err != nil {
LogError("Error reading directory %s: %v", directory, err)
LogError("Failed to search for pattern %s: %v", pattern, err)
status <- err
return
}
for _, file := range files {
if file.IsDir() {
directories <- filepath.Join(directory, file.Name())
} else {
if IsYAMLSyncFile(file.Name()) {
output <- filepath.Join(directory, file.Name())
}
atomic.AddInt32(filesProcessed, 1)
}
fullPath := filepath.Join(input, file)
LogInfo("Found sync file: %s", FormatPathValue(fullPath))
output <- fullPath
}
}
func IsYAMLSyncFile(filename string) bool {
return filename == "sync.yaml" || filename == "sync.yml"
LogInfo("Completed recursive search for sync files")
}