dave/synclib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Fix some issues with recursion

Browse Source
This commit is contained in:
David Majdandžić
2024-04-03 17:37:36 +02:00
parent 53cdb95324
commit df6a59970c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.go
View File

@@ -87,15 +87,21 @@ func ReadFromFilesRecursively(input string) ([]LinkInstruction, error) {
log.Fatalf("Failed to get sync files recursively: %s%+v%s", ErrorColor, err, DefaultColor) log.Fatalf("Failed to get sync files recursively: %s%+v%s", ErrorColor, err, DefaultColor)
} }
dirRegex, _ := regexp.Compile("^(.+?)sync$") dirRegex, _ := regexp.Compile(`^(.+?)[/\\]sync$`)
for _, file := range files { for _, file := range files {
file = NormalizePath(file) file = NormalizePath(file)
// This "has" to be done because instructions are resolved in relation to cwd // This "has" to be done because instructions are resolved in relation to cwd
fileDir := dirRegex.FindStringSubmatch(file) fileDir := dirRegex.FindStringSubmatch(file)
log.Printf("Changing directory to %s%s%s (for %s%s%s)", PathColor, fileDir[1], DefaultColor, PathColor, file, DefaultColor)
if fileDir == nil {
log.Printf("Failed to extract directory from %s%s%s", SourceColor, file, DefaultColor)
continue
}
err := os.Chdir(fileDir[1]) err := os.Chdir(fileDir[1])
if err != nil { if err != nil {
log.Fatalf("Failed to change directory to %s%s%s: %s%+v%s", SourceColor, fileDir[1], DefaultColor, ErrorColor, err, DefaultColor) log.Printf("Failed to change directory to %s%s%s: %s%+v%s", SourceColor, fileDir[1], DefaultColor, ErrorColor, err, DefaultColor)
continue
} }
fileInstructions, _ := ReadFromFile(file) fileInstructions, _ := ReadFromFile(file)
@@ -199,7 +205,7 @@ func RunInstruction(instruction LinkInstruction) error {
} }
if AreSame(instruction.Source, instruction.Target) { if AreSame(instruction.Source, instruction.Target) {
log.Printf("Source %s%s%s and target %s%s%s are the same, nothing to do...", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor) log.Printf("Source %s%s%s and target %s%s%s are the same, %snothing to do...%s", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor, PathColor, DefaultColor)
return nil return nil
} }