Add srcRemote and dstRemote parameters to DirMove #954

local/local.go

@@ -485,38 +485,38 @@ func (f *Fs) Move(src fs.Object, remote string) (fs.Object, error) {
 	return dstObj, nil
 }
 
-// DirMove moves src directory to this remote using server side move
-// operations.
+// DirMove moves src, srcRemote to this remote at dstRemote
+// using server side move operations.
 //
 // Will only be called if src.Fs().Name() == f.Name()
 //
 // If it isn't possible then return fs.ErrorCantDirMove
 //
 // If destination exists then return fs.ErrorDirExists
-func (f *Fs) DirMove(src fs.Fs) error {
+func (f *Fs) DirMove(src fs.Fs, srcRemote, dstRemote string) error {
 	srcFs, ok := src.(*Fs)
 	if !ok {
 		fs.Debugf(srcFs, "Can't move directory - not same remote type")
 		return fs.ErrorCantDirMove
 	}
-	// Check if source exists
-	sstat, err := os.Lstat(srcFs.root)
-	if err != nil {
-		return err
-	}
-	// And is a directory
-	if !sstat.IsDir() {
-		return fs.ErrorCantDirMove
-	}
+	srcPath := f.cleanPath(filepath.Join(srcFs.root, srcRemote))
+	dstPath := f.cleanPath(filepath.Join(f.root, dstRemote))
 
 	// Check if destination exists
-	_, err = os.Lstat(f.root)
+	_, err := os.Lstat(dstPath)
 	if !os.IsNotExist(err) {
 		return fs.ErrorDirExists
 	}
 
+	// Create parent of destination
+	dstParentPath, _ := getDirFile(dstPath)
+	err = os.MkdirAll(dstParentPath, 0777)
+	if err != nil {
+		return err
+	}
+
 	// Do the move
-	return os.Rename(srcFs.root, f.root)
+	return os.Rename(srcPath, dstPath)
 }
 
 // Hashes returns the supported hash sets.