github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-30 12:34:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

dropbox: fix entry doesn't belong in directory error - fixes #1558

Browse Source 
This was caused by the unreliable casing in `path_lower` as returned
in the directory listings.  We now ignore everything except the last
element in `path_lower` which is guaranteed to have the correct case.
This commit is contained in:
Nick Craig-Wood 2017-08-10 12:06:50 +01:00
parent dcbf538416
commit d54fca4e58
1 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dropbox/dropbox.go
View File

@ -17,7 +17,9 @@ casing. Changes to only the casing of paths won't be returned by
list_folder/continue. This field will be null if the file or folder is list_folder/continue. This field will be null if the file or folder is
not mounted. This field is optional. not mounted. This field is optional.
We solve this by not implementing the ListR interface. The dropbox remote will recurse directory by directory and all will be well. We solve this by not implementing the ListR interface. The dropbox
remote will recurse directory by directory only using the last element
of path_display and all will be well.
*/ */
import ( import (
@ -295,29 +297,6 @@ func (f *Fs) NewObject(remote string) (fs.Object, error) {
return f.newObjectWithInfo(remote, nil) return f.newObjectWithInfo(remote, nil)
} }
// Strips the root off path and returns it
func strip(path, root string) (string, error) {
if len(root) > 0 {
if root[0] != '/' {
root = "/" + root
}
if root[len(root)-1] != '/' {
root += "/"
}
} else if len(root) == 0 {
root = "/"
}
if !strings.HasPrefix(strings.ToLower(path), strings.ToLower(root)) {
return "", errors.Errorf("path %q is not under root %q", path, root)
}
return path[len(root):], nil
}
// Strips the root off path and returns it
func (f *Fs) stripRoot(path string) (string, error) {
return strip(path, f.slashRootSlash)
}
// List the objects and directories in dir into entries. The // List the objects and directories in dir into entries. The
// entries can be returned in any order but should be for a // entries can be returned in any order but should be for a
// complete directory. // complete directory.
@ -387,24 +366,15 @@ func (f *Fs) List(dir string) (entries fs.DirEntries, err error) {
continue continue
} }
entryPath := metadata.PathDisplay // FIXME PathLower // Only the last element is reliably cased in PathDisplay
entryPath := metadata.PathDisplay
leaf := path.Base(entryPath)
remote := path.Join(dir, leaf)
if folderInfo != nil { if folderInfo != nil {
name, err := f.stripRoot(entryPath + "/") d := fs.NewDir(remote, time.Now())
if err != nil { entries = append(entries, d)
return nil, err
}
name = strings.Trim(name, "/")
if name != "" && name != dir {
d := fs.NewDir(name, time.Now())
entries = append(entries, d)
}
} else if fileInfo != nil { } else if fileInfo != nil {
path, err := f.stripRoot(entryPath) o, err := f.newObjectWithInfo(remote, fileInfo)
if err != nil {
return nil, err
}
o, err := f.newObjectWithInfo(path, fileInfo)
if err != nil { if err != nil {
return nil, err return nil, err
} }