jgaunt/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2026-01-06 18:43:50 +00:00
Code Issues Projects Releases Wiki Activity

operations: interactive mode -i/--interactive for destructive operations #3886

Browse Source
This commit is contained in:
fishbullet
2020-03-20 21:43:29 +03:00
committed by Nick Craig-Wood
parent 2ea15a72bc
commit ba5eb230fb
4 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/operations/dedupe.go
View File

@@ -44,7 +44,7 @@ outer:
newName = fmt.Sprintf("%s-%d%s", base, i+suffix, ext)
_, err = f.NewObject(ctx, newName)
}
if !fs.Config.DryRun {
if !skipDestructive(ctx, o, "rename") {
newObj, err := doMove(ctx, o, newName)
if err != nil {
err = fs.CountError(err)
@@ -52,8 +52,6 @@ outer:
continue
}
fs.Infof(newObj, "renamed from: %v", o)
} else {
fs.Logf(remote, "Not renaming to %q as --dry-run", newName)
}
}
}
@@ -255,15 +253,13 @@ func dedupeMergeDuplicateDirs(ctx context.Context, f fs.Fs, duplicateDirs [][]fs
return errors.Errorf("%v: can't flush dir cache", f)
}
for _, dirs := range duplicateDirs {
if !fs.Config.DryRun {
if !skipDestructive(ctx, dirs[0], "merge duplicate directories") {
fs.Infof(dirs[0], "Merging contents of duplicate directories")
err := mergeDirs(ctx, dirs)
if err != nil {
err = fs.CountError(err)
fs.Errorf(nil, "merge duplicate dirs: %v", err)
}
} else {
fs.Infof(dirs[0], "NOT Merging contents of duplicate directories as --dry-run")
}
}
dirCacheFlush()