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

vfs: fix edge cases when reading ModTime from file

Browse Source 
This fixes the unreliable test TestMount/CacheMode=full/TestFileModTime
This commit is contained in:
Nick Craig-Wood 2019-11-11 15:56:59 +00:00
parent 9115752679
commit 358f5a8084
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vfs/file.go
View File

@ -274,18 +274,16 @@ func (f *File) ModTime() (modTime time.Time) {
f.mu.RLock()
defer f.mu.RUnlock()
if !f.d.vfs.Opt.NoModTime {
// if o is nil it isn't valid yet or there are writers, so return the size so far
if f.o == nil || len(f.writers) != 0 || f.readWriterClosing {
if !f.pendingModTime.IsZero() {
return f.pendingModTime
}
} else {
return f.o.ModTime(context.TODO())
}
if f.d.vfs.Opt.NoModTime {
return f.d.modTime
}
return f.d.modTime
if !f.pendingModTime.IsZero() {
return f.pendingModTime
}
if f.o == nil {
return f.d.modTime
}
return f.o.ModTime(context.TODO())
}
// nonNegative returns 0 if i is -ve, i otherwise