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

Implement the Files flag and add some tests

Browse Source
This commit is contained in:
PhatPhuckDave
2025-11-20 14:18:20 +01:00
parent ade7c4d2b2
commit b35697d227
3 changed files with 188 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
instruction.go
View File

@@ -17,6 +17,7 @@ type LinkInstruction struct {
Force bool `yaml:"force,omitempty"`
Hard bool `yaml:"hard,omitempty"`
Delete bool `yaml:"delete,omitempty"`
Files bool `yaml:"files,omitempty"`
}
type YAMLConfig struct {
@@ -45,6 +46,9 @@ func (instruction *LinkInstruction) String() string {
if instruction.Delete {
flags = append(flags, "delete=true")
}
if instruction.Files {
flags = append(flags, "files=true")
}
flagsStr := ""
if len(flags) > 0 {
@@ -115,6 +119,8 @@ func ParseInstruction(line, workdir string) (LinkInstruction, error) {
if instruction.Delete {
instruction.Force = true // Delete implies Force
}
case 5: // Files flag (6th position)
instruction.Files = isTrue(flagPart)
}
continue
}
@@ -139,6 +145,8 @@ func ParseInstruction(line, workdir string) (LinkInstruction, error) {
if instruction.Delete {
instruction.Force = true // Delete implies Force
}
case "files":
instruction.Files = isTrue(flagValue)
}
}
@@ -169,6 +177,18 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
return
}
if instruction.Files {
info, err := os.Stat(instruction.Source)
if err != nil {
status <- fmt.Errorf("could not stat source %s; err: %v", FormatSourcePath(instruction.Source), err)
return
}
if info.IsDir() {
status <- fmt.Errorf("source %s is a directory but files=true", FormatSourcePath(instruction.Source))
return
}
}
if !instruction.Force && AreSame(instruction.Source, instruction.Target) {
//status <- fmt.Errorf("source %s and target %s are the same, nothing to do...",
// FormatSourcePath(instruction.Source),
@@ -180,6 +200,12 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
}
if FileExists(instruction.Target) {
if instruction.Files {
if info, err := os.Stat(instruction.Target); err == nil && info.IsDir() {
status <- fmt.Errorf("target %s is a directory but files=true", FormatTargetPath(instruction.Target))
return
}
}
if instruction.Force {
isSymlink, err := IsSymlink(instruction.Target)
if err != nil {
@@ -317,10 +343,14 @@ func preprocessInstructions(instructions []LinkInstruction, filename, workdir st
// This is a from reference - load the referenced file
fromInstructions, err := loadFromReference(instr.Source, filename, workdir, visited)
if err != nil {
if errors.Is(err, os.ErrNotExist) {
var absRefErr *absoluteReferenceError
if errors.As(err, &absRefErr) {
LogError("Referenced file not found: %s (from %s), skipping", instr.Source, filename)
continue
}
if errors.Is(err, os.ErrNotExist) {
LogError("Referenced file not found: %s (from %s), stopping", instr.Source, filename)
}
return nil, fmt.Errorf("error loading from reference %s: %w", instr.Source, err)
}
result = append(result, fromInstructions...)
@@ -338,6 +368,19 @@ func preprocessInstructions(instructions []LinkInstruction, filename, workdir st
}
// loadFromReference loads instructions from a referenced file
type absoluteReferenceError struct {
path string
err error
}
func (e *absoluteReferenceError) Error() string {
return e.err.Error()
}
func (e *absoluteReferenceError) Unwrap() error {
return e.err
}
func loadFromReference(fromFile, currentFile, workdir string, visited map[string]bool) ([]LinkInstruction, error) {
// First convert home directory if it starts with ~
fromPath, err := ConvertHome(fromFile)
@@ -345,6 +388,8 @@ func loadFromReference(fromFile, currentFile, workdir string, visited map[string
return nil, fmt.Errorf("error converting home directory: %w", err)
}
refIsAbsolute := filepath.IsAbs(fromPath)
// Convert relative paths to absolute paths based on the current file's directory
if !filepath.IsAbs(fromPath) {
currentDir := filepath.Dir(currentFile)
@@ -356,19 +401,26 @@ func loadFromReference(fromFile, currentFile, workdir string, visited map[string
// Recursively parse the referenced file with cycle detection
fromWorkdir := filepath.Dir(fromPath)
return parseYAMLFileRecursive(fromPath, fromWorkdir, visited)
links, err := parseYAMLFileRecursive(fromPath, fromWorkdir, visited)
if err != nil {
if errors.Is(err, os.ErrNotExist) && refIsAbsolute {
return nil, &absoluteReferenceError{path: fromPath, err: err}
}
return nil, err
}
return links, nil
}
// expandGlobs expands glob patterns in a single instruction
func expandGlobs(instr LinkInstruction, filename, workdir string) ([]LinkInstruction, error) {
// Convert home directory (~) before expanding pattern
// Convert home directory (~) before expanding pattern
convertedSource, err := ConvertHome(instr.Source)
if err != nil {
return nil, fmt.Errorf("error converting home directory in source %s: %w", instr.Source, err)
}
LogSource("Expanding pattern source %s in YAML file %s", convertedSource, filename)
newlinks, err := ExpandPattern(convertedSource, workdir, instr.Target)
newlinks, err := ExpandPattern(convertedSource, workdir, instr.Target, instr.Files)
if err != nil {
return nil, err
}
@@ -378,6 +430,7 @@ func expandGlobs(instr LinkInstruction, filename, workdir string) ([]LinkInstruc
newlinks[i].Delete = instr.Delete
newlinks[i].Hard = instr.Hard
newlinks[i].Force = instr.Force
newlinks[i].Files = instr.Files
}
LogInfo("Expanded pattern %s in YAML file %s to %d links",
@@ -444,7 +497,10 @@ func parseYAMLFileRecursive(filename, workdir string, visited map[string]bool) (
return processedInstructions, nil
}
func ExpandPattern(source, workdir, target string) (links []LinkInstruction, err error) {
func ExpandPattern(source, workdir, target string, filesOnly bool) (links []LinkInstruction, err error) {
if strings.TrimSpace(source) == "" {
return nil, nil
}
// Convert home directory (~) before splitting pattern
source, err = ConvertHome(source)
if err != nil {
@@ -464,43 +520,45 @@ func ExpandPattern(source, workdir, target string) (links []LinkInstruction, err
return nil, fmt.Errorf("error expanding pattern: %w", err)
}
targetIsFile := false
if info, err := os.Stat(target); err == nil && !info.IsDir() {
targetIsFile = true
}
singleMatch := len(files) == 1
for _, file := range files {
if len(files) == 1 {
// Special case: if there is only one file
// This should only ever happen if our source is a path (and not a glob!)
// And our target is a path
// ...but it will also happen if the source IS a glob and it happens to match ONE file
// I think that should happen rarely enough to not be an issue...
fullPath := filepath.Join(static, file)
info, err := os.Stat(fullPath)
if err != nil {
LogError("Failed to stat %s: %v", FormatSourcePath(fullPath), err)
continue
}
if singleMatch {
if info.IsDir() && filesOnly {
LogInfo("Files-only mode: skipping single matched directory %s", FormatSourcePath(fullPath))
continue
}
links = append(links, LinkInstruction{
Source: filepath.Join(static, file),
Source: fullPath,
Target: target,
})
continue
}
if info, err := os.Stat(file); err == nil && info.IsDir() {
if filesOnly && info.IsDir() {
LogInfo("Files-only mode: skipping directory %s", FormatSourcePath(fullPath))
continue
}
if info.IsDir() {
// We don't care about matched directories
// We want files within them
LogInfo("Skipping directory %s", file)
continue
}
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)
}
targetPath := filepath.Join(target, file)
links = append(links, LinkInstruction{
Source: filepath.Join(static, file),
Source: fullPath,
Target: targetPath,
})
}