KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

Check for source and dest being the same in sync/copy/move

Browse source
This commit is contained in:
Nick Craig-Wood 2015-09-01 20:50:28 +01:00
parent 92745aa950
commit 8d33ce0154
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/operations.go
View file

@ -380,12 +380,22 @@ func readFilesMap(fs Fs) map[string]Object {
return files return files
} }
// Returns true if fdst and fsrc point to the same underlying Fs
func FsSame(fdst, fsrc Fs) bool {
return fdst.Name() == fsrc.Name() && fdst.Root() == fsrc.Root()
}
// Syncs fsrc into fdst // Syncs fsrc into fdst
// //
// If Delete is true then it deletes any files in fdst that aren't in fsrc // If Delete is true then it deletes any files in fdst that aren't in fsrc
// //
// If DoMove is true then files will be moved instead of copied // If DoMove is true then files will be moved instead of copied
func syncCopyMove(fdst, fsrc Fs, Delete bool, DoMove bool) error { func syncCopyMove(fdst, fsrc Fs, Delete bool, DoMove bool) error {
if FsSame(fdst, fsrc) {
ErrorLog(fdst, "Nothing to do as source and destination are the same")
return nil
}
err := fdst.Mkdir() err := fdst.Mkdir()
if err != nil { if err != nil {
Stats.Error() Stats.Error()
@ -471,6 +481,11 @@ func CopyDir(fdst, fsrc Fs) error {
// Moves fsrc into fdst // Moves fsrc into fdst
func MoveDir(fdst, fsrc Fs) error { func MoveDir(fdst, fsrc Fs) error {
if FsSame(fdst, fsrc) {
ErrorLog(fdst, "Nothing to do as source and destination are the same")
return nil
}
// First attempt to use DirMover // First attempt to use DirMover
if fdstDirMover, ok := fdst.(DirMover); ok && fsrc.Name() == fdst.Name() { if fdstDirMover, ok := fdst.(DirMover); ok && fsrc.Name() == fdst.Name() {
err := fdstDirMover.DirMove(fsrc) err := fdstDirMover.DirMove(fsrc)