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

drive: improve directory notifications in ChangeNotify

Browse Source 
When moving a directory in drive, most of the time only a notification
for the directory itself is created, not the old or new parents.

This tires to find the old path in the dirCache and the new path with
the dirCache of the new parent, which can result in two notifications
for a moved directory.
This commit is contained in:
Fabian Möller 2018-09-25 17:55:33 +02:00 committed by Nick Craig-Wood
parent 59e14c25df
commit 05fa9cb379
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/drive/drive.go
View File

@ -2061,15 +2061,16 @@ func (f *Fs) changeNotifyRunner(notifyFunc func(string, fs.EntryType), startPage
} }
var pathsToClear []entryType var pathsToClear []entryType
for _, change := range changeList.Changes { for _, change := range changeList.Changes {
// find the previous path
if path, ok := f.dirCache.GetInv(change.FileId); ok { if path, ok := f.dirCache.GetInv(change.FileId); ok {
if change.File != nil && change.File.MimeType != driveFolderType { if change.File != nil && change.File.MimeType != driveFolderType {
pathsToClear = append(pathsToClear, entryType{path: path, entryType: fs.EntryObject}) pathsToClear = append(pathsToClear, entryType{path: path, entryType: fs.EntryObject})
} else { } else {
pathsToClear = append(pathsToClear, entryType{path: path, entryType: fs.EntryDirectory}) pathsToClear = append(pathsToClear, entryType{path: path, entryType: fs.EntryDirectory})
} }
continue
} }
// find the new path
if change.File != nil { if change.File != nil {
changeType := fs.EntryDirectory changeType := fs.EntryDirectory
if change.File.MimeType != driveFolderType { if change.File.MimeType != driveFolderType {