octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1647 from calmh/fix-localindexupdated

Browse Source 
Homogenize the LocalIndexUpdated event
This commit is contained in:
Audrius Butkevicius 2015-04-17 08:14:38 +01:00
commit 9eb679d70a
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/model/model.go
View File

@ -1035,8 +1035,8 @@ func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
m.fmut.RUnlock() m.fmut.RUnlock()
events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{ events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
"folder": folder, "folder": folder,
"numFiles": len(fs), "items": len(fs),
}) })
} }
@ -1197,19 +1197,12 @@ nextSub:
batchSize := 100 batchSize := 100
batch := make([]protocol.FileInfo, 0, batchSize) batch := make([]protocol.FileInfo, 0, batchSize)
for f := range fchan { for f := range fchan {
events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
"folder": folder,
"name": f.Name,
"modified": time.Unix(f.Modified, 0),
"flags": fmt.Sprintf("0%o", f.Flags),
"size": f.Size(),
})
if len(batch) == batchSize { if len(batch) == batchSize {
if err := m.CheckFolderHealth(folder); err != nil { if err := m.CheckFolderHealth(folder); err != nil {
l.Infof("Stopping folder %s mid-scan due to folder error: %s", folder, err) l.Infof("Stopping folder %s mid-scan due to folder error: %s", folder, err)
return err return err
} }
fs.Update(protocol.LocalDeviceID, batch) m.updateLocals(folder, batch)
batch = batch[:0] batch = batch[:0]
} }
batch = append(batch, f) batch = append(batch, f)
@ -1248,7 +1241,7 @@ nextSub:
} }
if len(batch) == batchSize { if len(batch) == batchSize {
fs.Update(protocol.LocalDeviceID, batch) m.updateLocals(folder, batch)
batch = batch[:0] batch = batch[:0]
} }
@ -1263,13 +1256,6 @@ nextSub:
Modified: f.Modified, Modified: f.Modified,
Version: f.Version, // The file is still the same, so don't bump version Version: f.Version, // The file is still the same, so don't bump version
} }
events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
"folder": folder,
"name": f.Name,
"modified": time.Unix(f.Modified, 0),
"flags": fmt.Sprintf("0%o", f.Flags),
"size": f.Size(),
})
batch = append(batch, nf) batch = append(batch, nf)
} else if _, err := osutil.Lstat(filepath.Join(folderCfg.Path(), f.Name)); err != nil { } else if _, err := osutil.Lstat(filepath.Join(folderCfg.Path(), f.Name)); err != nil {
// File has been deleted. // File has been deleted.
@ -1287,20 +1273,13 @@ nextSub:
Modified: f.Modified, Modified: f.Modified,
Version: f.Version.Update(m.shortID), Version: f.Version.Update(m.shortID),
} }
events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
"folder": folder,
"name": f.Name,
"modified": time.Unix(f.Modified, 0),
"flags": fmt.Sprintf("0%o", f.Flags),
"size": f.Size(),
})
batch = append(batch, nf) batch = append(batch, nf)
} }
} }
return true return true
}) })
if len(batch) > 0 { if len(batch) > 0 {
fs.Update(protocol.LocalDeviceID, batch) m.updateLocals(folder, batch)
} }
runner.setState(FolderIdle) runner.setState(FolderIdle)