extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-07 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

drive: cleanup changeNotifyRunner

Browse Source
This commit is contained in:
Fabian Möller 2018-09-25 17:50:33 +02:00
parent a20fae0364
commit 527c0af1c3
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/drive/drive.go
View File

@ -2078,15 +2078,11 @@ func (f *Fs) changeNotifyRunner(notifyFunc func(string, fs.EntryType), startPage
// translate the parent dir of this object // translate the parent dir of this object
if len(change.File.Parents) > 0 { if len(change.File.Parents) > 0 {
if path, ok := f.dirCache.GetInv(change.File.Parents[0]); ok { if parentPath, ok := f.dirCache.GetInv(change.File.Parents[0]); ok {
// and append the drive file name to compute the full file name // and append the drive file name to compute the full file name
if len(path) > 0 { newPath := path.Join(parentPath, change.File.Name)
path = path + "/" + change.File.Name
} else {
path = change.File.Name
}
// this will now clear the actual file too // this will now clear the actual file too
pathsToClear = append(pathsToClear, entryType{path: path, entryType: changeType}) pathsToClear = append(pathsToClear, entryType{path: newPath, entryType: changeType})
} }
} else { // a true root object that is changed } else { // a true root object that is changed
pathsToClear = append(pathsToClear, entryType{path: change.File.Name, entryType: changeType}) pathsToClear = append(pathsToClear, entryType{path: change.File.Name, entryType: changeType})
@ -2094,12 +2090,12 @@ func (f *Fs) changeNotifyRunner(notifyFunc func(string, fs.EntryType), startPage
} }
} }
visitedPaths := make(map[string]bool) visitedPaths := make(map[string]struct{})
for _, entry := range pathsToClear { for _, entry := range pathsToClear {
if _, ok := visitedPaths[entry.path]; ok { if _, ok := visitedPaths[entry.path]; ok {
continue continue
} }
visitedPaths[entry.path] = true visitedPaths[entry.path] = struct{}{}
notifyFunc(entry.path, entry.entryType) notifyFunc(entry.path, entry.entryType)
} }