Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't count deleted files in synced bytes (fixes #88)

This commit is contained in:
Jakob Borg 2014-03-14 11:09:05 +01:00
parent 473df1bd19
commit d2d32f26c7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/syncthing/model.go
View File

@ -162,7 +162,9 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
var tot int64
for _, f := range m.global {
tot += f.Size
if f.Flags&protocol.FlagDeleted == 0 {
tot += f.Size
}
}
var res = make(map[string]ConnectionInfo)
@ -178,7 +180,7 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
var have int64
for _, f := range m.remote[node] {
if f.Equals(m.global[f.Name]) {
if f.Equals(m.global[f.Name]) && f.Flags&protocol.FlagDeleted == 0 {
have += f.Size
}
}
@ -241,8 +243,10 @@ func (m *Model) InSyncSize() (files, bytes int64) {
for n, f := range m.local {
if gf, ok := m.global[n]; ok && f.Equals(gf) {
files++
bytes += f.Size
if f.Flags&protocol.FlagDeleted == 0 {
files++
bytes += f.Size
}
}
}