octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-22 22:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Drop incoming updates for ignored items (fixes #1701)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/2975
This commit is contained in:
Jakob Borg 2016-04-18 18:35:31 +00:00 committed by Audrius Butkevicius
parent 4b07535e86
commit b81c8d2e1b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/model/model.go
View File

@ -543,6 +543,7 @@ func (m *Model) Index(deviceID protocol.DeviceID, folder string, fs []protocol.F
cfg := m.folderCfgs[folder] cfg := m.folderCfgs[folder]
files, ok := m.folderFiles[folder] files, ok := m.folderFiles[folder]
runner := m.folderRunners[folder] runner := m.folderRunners[folder]
ignores := m.folderIgnores[folder]
m.fmut.RUnlock() m.fmut.RUnlock()
if runner != nil { if runner != nil {
@ -555,7 +556,7 @@ func (m *Model) Index(deviceID protocol.DeviceID, folder string, fs []protocol.F
l.Fatalf("Index for nonexistant folder %q", folder) l.Fatalf("Index for nonexistant folder %q", folder)
} }
fs = filterIndex(folder, fs, cfg.IgnoreDelete) fs = filterIndex(folder, fs, cfg.IgnoreDelete, ignores)
files.Replace(deviceID, fs) files.Replace(deviceID, fs)
events.Default.Log(events.RemoteIndexUpdated, map[string]interface{}{ events.Default.Log(events.RemoteIndexUpdated, map[string]interface{}{
@ -585,13 +586,14 @@ func (m *Model) IndexUpdate(deviceID protocol.DeviceID, folder string, fs []prot
files := m.folderFiles[folder] files := m.folderFiles[folder]
cfg := m.folderCfgs[folder] cfg := m.folderCfgs[folder]
runner, ok := m.folderRunners[folder] runner, ok := m.folderRunners[folder]
ignores := m.folderIgnores[folder]
m.fmut.RUnlock() m.fmut.RUnlock()
if !ok { if !ok {
l.Fatalf("IndexUpdate for nonexistant folder %q", folder) l.Fatalf("IndexUpdate for nonexistant folder %q", folder)
} }
fs = filterIndex(folder, fs, cfg.IgnoreDelete) fs = filterIndex(folder, fs, cfg.IgnoreDelete, ignores)
files.Update(deviceID, fs) files.Update(deviceID, fs)
events.Default.Log(events.RemoteIndexUpdated, map[string]interface{}{ events.Default.Log(events.RemoteIndexUpdated, map[string]interface{}{
@ -2072,7 +2074,7 @@ func mapDeviceCfgs(devices []config.DeviceConfiguration) map[protocol.DeviceID]s
return m return m
} }
func filterIndex(folder string, fs []protocol.FileInfo, dropDeletes bool) []protocol.FileInfo { func filterIndex(folder string, fs []protocol.FileInfo, dropDeletes bool, ignores *ignore.Matcher) []protocol.FileInfo {
for i := 0; i < len(fs); { for i := 0; i < len(fs); {
if fs[i].Flags&^protocol.FlagsAll != 0 { if fs[i].Flags&^protocol.FlagsAll != 0 {
l.Debugln("dropping update for file with unknown bits set", fs[i]) l.Debugln("dropping update for file with unknown bits set", fs[i])
@ -2086,6 +2088,10 @@ func filterIndex(folder string, fs []protocol.FileInfo, dropDeletes bool) []prot
l.Debugln("dropping update for unsupported symlink", fs[i]) l.Debugln("dropping update for unsupported symlink", fs[i])
fs[i] = fs[len(fs)-1] fs[i] = fs[len(fs)-1]
fs = fs[:len(fs)-1] fs = fs[:len(fs)-1]
} else if ignores != nil && ignores.Match(fs[i].Name).IsIgnored() {
l.Debugln("dropping update for ignored item", fs[i])
fs[i] = fs[len(fs)-1]
fs = fs[:len(fs)-1]
} else { } else {
i++ i++
} }