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

Implement deleting real actual files

Browse Source
This commit is contained in:
PhatPhuckDave
2024-09-11 19:29:52 +02:00
parent ff1af19088
commit fc59878389
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
instruction.go
View File

@@ -15,10 +15,11 @@ type LinkInstruction struct {
Target string Target string
Force bool Force bool
Hard bool Hard bool
Delete bool
} }
func (instruction *LinkInstruction) String() string { func (instruction *LinkInstruction) String() string {
return fmt.Sprintf("%s%s%s%s%s%s%s%s%s%s%s", SourceColor, instruction.Source, DefaultColor, deliminer, TargetColor, instruction.Target, DefaultColor, deliminer, strconv.FormatBool(instruction.Force), deliminer, strconv.FormatBool(instruction.Hard)) return fmt.Sprintf("%s%s%s%s%s%s%s%s%s%s%s%s%s", SourceColor, instruction.Source, DefaultColor, deliminer, TargetColor, instruction.Target, DefaultColor, deliminer, strconv.FormatBool(instruction.Force), deliminer, strconv.FormatBool(instruction.Hard), deliminer, strconv.FormatBool(instruction.Delete))
} }
func ParseInstruction(line string) (LinkInstruction, error) { func ParseInstruction(line string) (LinkInstruction, error) {
@@ -41,6 +42,11 @@ func ParseInstruction(line string) (LinkInstruction, error) {
res, _ := regexp.MatchString(`^(?i)\s*T|TRUE\s*$`, parts[3]) res, _ := regexp.MatchString(`^(?i)\s*T|TRUE\s*$`, parts[3])
instruction.Hard = res instruction.Hard = res
} }
if len(parts) > 4 {
res, _ := regexp.MatchString(`^(?i)\s*T|TRUE\s*$`, parts[4])
instruction.Delete = res
instruction.Force = res
}
instruction.Source, _ = ConvertHome(instruction.Source) instruction.Source, _ = ConvertHome(instruction.Source)
instruction.Target, _ = ConvertHome(instruction.Target) instruction.Target, _ = ConvertHome(instruction.Target)
@@ -75,8 +81,15 @@ func (instruction *LinkInstruction) RunSync() error {
return fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor) return fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
} }
} else { } else {
if !instruction.Delete {
return fmt.Errorf("refusing to delte actual (non symlink) file %s%s%s", TargetColor, instruction.Target, DefaultColor) return fmt.Errorf("refusing to delte actual (non symlink) file %s%s%s", TargetColor, instruction.Target, DefaultColor)
} }
log.Printf("Deleting %s%s%s", TargetColor, instruction.Target, DefaultColor)
err = os.RemoveAll(instruction.Target)
if err != nil {
return fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
}
}
} else { } else {
return fmt.Errorf("target %s%s%s exists - handle manually or set the 'forced' flag (3rd field)", TargetColor, instruction.Target, DefaultColor) return fmt.Errorf("target %s%s%s exists - handle manually or set the 'forced' flag (3rd field)", TargetColor, instruction.Target, DefaultColor)
} }
@@ -140,9 +153,17 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
return return
} }
} else { } else {
if !instruction.Delete {
status <- fmt.Errorf("refusing to delte actual (non symlink) file %s%s%s", TargetColor, instruction.Target, DefaultColor) status <- fmt.Errorf("refusing to delte actual (non symlink) file %s%s%s", TargetColor, instruction.Target, DefaultColor)
return return
} }
log.Printf("Deleting %s%s%s", TargetColor, instruction.Target, DefaultColor)
err = os.RemoveAll(instruction.Target)
if err != nil {
status <- fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
return
}
}
} else { } else {
status <- fmt.Errorf("target %s%s%s exists - handle manually or set the 'forced' flag (3rd field)", TargetColor, instruction.Target, DefaultColor) status <- fmt.Errorf("target %s%s%s exists - handle manually or set the 'forced' flag (3rd field)", TargetColor, instruction.Target, DefaultColor)
return return

2
util.go
View File

@@ -29,7 +29,7 @@ func FileExists(path string) bool {
func NormalizePath(input string) string { func NormalizePath(input string) string {
workingdirectory, _ := os.Getwd() workingdirectory, _ := os.Getwd()
input = strings.ReplaceAll(input, "\\", "/") input = filepath.ToSlash(input)
input = strings.ReplaceAll(input, "\"", "") input = strings.ReplaceAll(input, "\"", "")
if !filepath.IsAbs(input) { if !filepath.IsAbs(input) {