Browse Source

lib/model: Trigger a pull when ignore patterns change

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4532
Jakob Borg 8 years ago
parent
commit
0901350087
3 changed files with 3 additions and 6 deletions
  1. 0 2
      lib/model/folder.go
  2. 2 3
      lib/model/model.go
  3. 1 1
      lib/model/rwfolder.go

+ 0 - 2
lib/model/folder.go

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

+ 2 - 3
lib/model/model.go

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

+ 1 - 1
lib/model/rwfolder.go

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