Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Nick Craig-Wood
8f36afac89 vfs: check destination on rename and delete if it exists first FIXME needs tests
Some backends (eg onedrive) will throw an error if we rename over an
existing file and some (drive) will create a duplicate.

This patch checks to see if the destination exists and removes it or
returns an error as appropriate.

Fixes #4293
2020-07-22 13:10:16 +01:00
Nick Craig-Wood
6277b8bf03 vfs: fix saving from chrome without --vfs-cache-mode writes - fixes #4293
Due to Chrome's rather complicated use of file handles when saving
files from the download windows, rclone was attempting to truncate a
closed file.

The file appeared closed due to the handling of 0 length files.

This patch removes the check for the file being closed in the
WriteFileHandle.Truncate call. This is safe because the only action
this method takes is to emit an error message if the file is the wrong
size.

See: https://forum.rclone.org/t/google-drive-cannot-save-files-directly-from-browser-to-gdrive-mounted-path/17992/
2020-07-22 11:03:12 +01:00
2 changed files with 30 additions and 3 deletions

View file

@ -781,6 +781,9 @@ func (d *Dir) Rename(oldName, newName string, destDir *Dir) error {
fs.Errorf(oldPath, "Dir.Rename error: %v", err)
return err
}
// Check to see if destination exists
newNode, _ := destDir.stat(newName)
destinationExists := newNode != nil
switch x := oldNode.DirEntry().(type) {
case nil:
if oldFile, ok := oldNode.(*File); ok {
@ -793,6 +796,19 @@ func (d *Dir) Rename(oldName, newName string, destDir *Dir) error {
return EPERM
}
case fs.Object:
if destinationExists {
// Can't overwrite dir with file
if newNode.IsDir() {
return EEXIST // EISDIR is POSIX
}
// Try to delete the file
fs.Debugf(newPath, "Dir.Rename removing existing file")
err = newNode.Remove()
if err != nil {
fs.Errorf(newPath, "Dir.Rename error: couldn't delete existing file: %v", err)
return err
}
}
if oldFile, ok := oldNode.(*File); ok {
if err = oldFile.rename(context.TODO(), destDir, newName); err != nil {
fs.Errorf(oldPath, "Dir.Rename error: %v", err)
@ -804,6 +820,19 @@ func (d *Dir) Rename(oldName, newName string, destDir *Dir) error {
return err
}
case fs.Directory:
if destinationExists {
// Can't overwrite file with dir
if newNode.IsFile() {
return EEXIST // ENOTDIR is POSIX
}
// Try to delete the existing directory - will succeed only if empty
fs.Debugf(newPath, "Dir.Rename removing existing dir")
err = newNode.Remove()
if err != nil {
fs.Errorf(newPath, "Dir.Rename error: couldn't rmdir existing dir: %v", err)
return err
}
}
features := d.f.Features()
if features.DirMove == nil && features.Move == nil && features.Copy == nil {
err := errors.Errorf("Fs %q can't rename directories (no DirMove, Move or Copy)", d.f)

View file

@ -283,11 +283,9 @@ func (fh *WriteFileHandle) Stat() (os.FileInfo, error) {
// Truncate file to given size
func (fh *WriteFileHandle) Truncate(size int64) (err error) {
// defer log.Trace(fh.remote, "size=%d", size)("err=%v", &err)
fh.mu.Lock()
defer fh.mu.Unlock()
if fh.closed {
return ECLOSED
}
if size != fh.offset {
fs.Errorf(fh.remote, "WriteFileHandle: Truncate: Can't change size without --vfs-cache-mode >= writes")
return EPERM