extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 16:34:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Move when underlying remote returns ErrorCantMove

Browse Source
This commit is contained in:
Nick Craig-Wood 2016-08-23 17:40:04 +01:00
parent e6a0521ca2
commit a54806e5c1
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fs/sync.go
View File

@ -262,6 +262,17 @@ func (s *syncCopyMove) pairMover(in ObjectPairChan, fdst Fs, wg *sync.WaitGroup)
src := pair.src
dst := pair.dst
Stats.Transferring(src.Remote())
doCopy := func() {
// Copy dst <- src
err := Copy(fdst, dst, src)
s.processError(err)
if err != nil {
ErrorLog(src, "Not deleting as copy failed: %v", err)
} else {
// Delete src if no error on copy
s.processError(DeleteFile(src))
}
}
if Config.DryRun {
Log(src, "Not moving as --dry-run")
} else if haveMover && src.Fs().Name() == fdst.Name() {
@ -272,22 +283,22 @@ func (s *syncCopyMove) pairMover(in ObjectPairChan, fdst Fs, wg *sync.WaitGroup)
// Move dst <- src
_, err := fdstMover.Move(src, src.Remote())
if err != nil {
Stats.Error()
ErrorLog(dst, "Couldn't move: %v", err)
s.processError(err)
// If this remote can't do moves,
// then set the flag and copy
if err == ErrorCantMove {
Debug(src, "Can't move, switching to copy")
haveMover = false
doCopy()
} else {
Stats.Error()
ErrorLog(dst, "Couldn't move: %v", err)
s.processError(err)
}
} else {
Debug(src, "Moved")
}
} else {
// Copy dst <- src
err := Copy(fdst, dst, src)
s.processError(err)
if err != nil {
ErrorLog(src, "Not deleting as copy failed: %v", err)
} else {
// Delete src if no error on copy
s.processError(DeleteFile(src))
}
doCopy()
}
Stats.DoneTransferring(src.Remote())
case <-s.abort: