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

No longer support old format

Browse Source
This commit is contained in:
PhatPhuckDave
2025-03-10 18:10:33 +01:00
parent 71ea17122c
commit 083d42a9dd
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
main.go
View File

@@ -20,8 +20,7 @@ const ImportantColor = BRed
const DefaultColor = White const DefaultColor = White
const PathColor = Green const PathColor = Green
var DirRegex, _ = regexp.Compile(`^(.+?)[/\\]sync(?:\.ya?ml)?$`) var FileRegex, _ = regexp.Compile(`sync\.ya?ml$`)
var FileRegex, _ = regexp.Compile(`^sync(?:\.ya?ml)?$`)
var programName = os.Args[0] var programName = os.Args[0]
func main() { func main() {
@@ -65,10 +64,7 @@ func main() {
go ReadFromStdin(instructions, status) go ReadFromStdin(instructions, status)
default: default:
if _, err := os.Stat("sync"); err == nil { if _, err := os.Stat("sync.yaml"); err == nil {
log.Printf("Using default sync file")
go ReadFromFile("sync", instructions, status, true)
} else if _, err := os.Stat("sync.yaml"); err == nil {
log.Printf("Using default sync.yaml file") log.Printf("Using default sync.yaml file")
go ReadFromFile("sync.yaml", instructions, status, true) go ReadFromFile("sync.yaml", instructions, status, true)
} else if _, err := os.Stat("sync.yml"); err == nil { } else if _, err := os.Stat("sync.yml"); err == nil {
@@ -172,7 +168,7 @@ func ReadFromFilesRecursively(input string, output chan *LinkInstruction, status
log.Printf("Processing file: %s%s%s", PathColor, file, DefaultColor) log.Printf("Processing file: %s%s%s", PathColor, file, DefaultColor)
// 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 := FileRegex.FindStringSubmatch(file)
if fileDir == nil { if fileDir == nil {
log.Printf("Failed to extract directory from %s%s%s", SourceColor, file, DefaultColor) log.Printf("Failed to extract directory from %s%s%s", SourceColor, file, DefaultColor)
return return
@@ -217,28 +213,6 @@ func ReadFromFile(input string, output chan *LinkInstruction, status chan error,
} }
return return
} }
// Handle CSV format (legacy)
file, err := os.Open(input)
if err != nil {
log.Fatalf("Failed to open file %s%s%s: %s%+v%s",
SourceColor, input, DefaultColor, ErrorColor, err, DefaultColor)
return
}
defer file.Close()
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
instruction, err := ParseInstruction(line, filepath.Dir(input))
if err != nil {
log.Printf("Error parsing line: %s'%s'%s, error: %s%+v%s",
SourceColor, line, DefaultColor, ErrorColor, err, DefaultColor)
continue
}
log.Printf("Read instruction: %s", instruction.String())
output <- &instruction
}
} }
func ReadFromArgs(output chan *LinkInstruction, status chan error) { func ReadFromArgs(output chan *LinkInstruction, status chan error) {

2
sync.yaml
View File

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