gui, lib/config, lib/model: Add ability to ignore folders offered by other nodes (fixes #3993)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4179
LGTM: AudriusButkevicius, calmh
This commit is contained in:
nrm21
2017-05-31 18:04:00 +00:00
committed by Jakob Borg
parent 3959eb26fb
commit b49bbe82dd
6 changed files with 36 additions and 0 deletions

View File

@@ -809,6 +809,11 @@ func (m *Model) ClusterConfig(deviceID protocol.DeviceID, cm protocol.ClusterCon
continue
}
if m.cfg.IgnoredFolder(folder.ID) {
l.Infof("Ignoring folder %s from device %s since we are configured to", folder.Description(), deviceID)
continue
}
if !m.folderSharedWithLocked(folder.ID, deviceID) {
events.Default.Log(events.FolderRejected, map[string]string{
"folder": folder.ID,