octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 11:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Trigger a pull when ignore patterns change

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4532
This commit is contained in:
Jakob Borg 2017-11-20 16:29:36 +00:00 committed by Simon Frei
parent 8078babf0a
commit 0901350087
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/folder.go
View File

@ -50,8 +50,6 @@ func (f *folder) DelayScan(next time.Duration) {
f.scan.Delay(next) f.scan.Delay(next)
} }
func (f *folder) IndexUpdated() {}
func (f *folder) IgnoresUpdated() { func (f *folder) IgnoresUpdated() {
if f.FSWatcherEnabled { if f.FSWatcherEnabled {
f.scheduleWatchRestart() f.scheduleWatchRestart()

3
lib/model/model.go
View File

@ -47,9 +47,8 @@ const (
type service interface { type service interface {
BringToFront(string) BringToFront(string)
DelayScan(d time.Duration) DelayScan(d time.Duration)
IndexUpdated() // Remote index was updated notification
IgnoresUpdated() // ignore matcher was updated notification IgnoresUpdated() // ignore matcher was updated notification
SchedulePull() SchedulePull() // something relevant changed, we should try a pull
Jobs() ([]string, []string) // In progress, Queued Jobs() ([]string, []string) // In progress, Queued
Scan(subs []string) error Scan(subs []string) error
Serve() Serve()

2
lib/model/rwfolder.go
View File

@ -1728,7 +1728,7 @@ func (f *sendReceiveFolder) basePause() time.Duration {
func (f *sendReceiveFolder) IgnoresUpdated() { func (f *sendReceiveFolder) IgnoresUpdated() {
f.folder.IgnoresUpdated() f.folder.IgnoresUpdated()
f.IndexUpdated() f.SchedulePull()
} }
// A []fileError is sent as part of an event and will be JSON serialized. // A []fileError is sent as part of an event and will be JSON serialized.