octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-04-11 03:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1955 from calmh/localver

Browse Source 
Add version to LocalIndexUpdate event.
This commit is contained in:
Audrius Butkevicius 2015-06-16 08:45:09 +01:00
commit 87811efc30
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/model/model.go
View File

@ -1123,8 +1123,10 @@ func sendIndexTo(initial bool, minLocalVer int64, conn protocol.Connection, fold
func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) { func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
m.fmut.RLock() m.fmut.RLock()
m.folderFiles[folder].Update(protocol.LocalDeviceID, fs) files := m.folderFiles[folder]
m.fmut.RUnlock() m.fmut.RUnlock()
files.Update(protocol.LocalDeviceID, fs)
m.rvmut.Lock() m.rvmut.Lock()
for _, f := range fs { for _, f := range fs {
delete(m.reqValidationCache, folder+"/"+f.Name) delete(m.reqValidationCache, folder+"/"+f.Name)
@ -1134,6 +1136,7 @@ func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{ events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
"folder": folder, "folder": folder,
"items": len(fs), "items": len(fs),
"version": files.LocalVersion(protocol.LocalDeviceID),
}) })
} }