github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-23 10:13:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a stable sort for sorting directory entries

Browse Source 
This is useful if there are duplicates. Assuming the remote delivers
the entries in a consistent order, this will give the best user
experience in syncing as it will consistently use the first entry for
the sync comparison.
This commit is contained in:
Nick Craig-Wood 2017-07-06 14:07:26 +01:00
parent 27b157580e
commit 69ff009264
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/operations.go
View File

@ -630,8 +630,14 @@ func ListDirSorted(fs Fs, includeAll bool, dir string) (entries DirEntries, err
entries = newEntries entries = newEntries
} }
// sort the directory entries by Remote // Sort the directory entries by Remote
sort.Sort(entries) //
// We use a stable sort here just in case there are
// duplicates. Assuming the remote delivers the entries in a
// consistent order, this will give the best user experience
// in syncing as it will use the first entry for the sync
// comparison.
sort.Stable(entries)
return entries, nil return entries, nil
} }

3
fs/walk.go
View File

@ -229,7 +229,7 @@ func (dt DirTree) checkParents(root string) {
// Sort sorts all the Entries // Sort sorts all the Entries
func (dt DirTree) Sort() { func (dt DirTree) Sort() {
for _, entries := range dt { for _, entries := range dt {
sort.Sort(entries) sort.Stable(entries)
} }
} }
@ -342,7 +342,6 @@ func walkR(f Fs, path string, includeAll bool, maxLevel int, fn WalkFunc, listR
if entries == nil { if entries == nil {
entries = emptyDir entries = emptyDir
} }
sort.Sort(entries)
err = fn(dirPath, entries, nil) err = fn(dirPath, entries, nil)
if err == ErrorSkipDir { if err == ErrorSkipDir {
skipping = true skipping = true