lib/model, cmd/syncthing: Also account for deleted files in folder summary events (ref #3496)

This should probably be reflected in the GUI somewhere as well...
This commit is contained in:
Jakob Borg
2016-09-02 10:45:30 +02:00
parent 5b37d0356c
commit 69b7f26e4c
4 changed files with 19 additions and 7 deletions

View File

@@ -564,7 +564,7 @@ func (m *Model) LocalSize(folder string) (nfiles, deleted int, bytes int64) {
}
// NeedSize returns the number and total size of currently needed files.
func (m *Model) NeedSize(folder string) (nfiles int, bytes int64) {
func (m *Model) NeedSize(folder string) (nfiles, ndeletes int, bytes int64) {
m.fmut.RLock()
defer m.fmut.RUnlock()
if rf, ok := m.folderFiles[folder]; ok {
@@ -576,7 +576,8 @@ func (m *Model) NeedSize(folder string) (nfiles int, bytes int64) {
}
fs, de, by := sizeOfFile(f)
nfiles += fs + de
nfiles += fs
ndeletes += de
bytes += by
return true
})