TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

walk: make NewDirTree always use ListR #2946

Browse source 
This fixes vfs/refresh with recurse=true needing the --fast-list flag
This commit is contained in:
Nick Craig-Wood 2019-02-03 16:06:04 +00:00
parent 315cee23a0
commit bdc638530e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/walk/walk.go
View file

@ -455,8 +455,8 @@ func walkNDirTree(f fs.Fs, path string, includeAll bool, maxLevel int, listDir l
// If maxLevel is < 0 then it will recurse indefinitely, else it will
// only do maxLevel levels.
//
// This is implemented by WalkR if Config.UseRecursiveListing is true
// and f supports it and level > 1, or WalkN otherwise.
// This is implemented by WalkR if f supports ListR and level > 1, or
// WalkN otherwise.
//
// If --files-from is set then a DirTree will be constructed with just
// those files in.
@ -466,7 +466,7 @@ func NewDirTree(f fs.Fs, path string, includeAll bool, maxLevel int) (DirTree, e
if filter.Active.HaveFilesFrom() {
return walkRDirTree(f, path, includeAll, maxLevel, filter.Active.MakeListR(f.NewObject))
}
if ListR := f.Features().ListR; (maxLevel < 0 || maxLevel > 1) && fs.Config.UseListR && ListR != nil {
if ListR := f.Features().ListR; (maxLevel < 0 || maxLevel > 1) && ListR != nil {
return walkRDirTree(f, path, includeAll, maxLevel, ListR)
}
return walkNDirTree(f, path, includeAll, maxLevel, list.DirSorted)