all: Display fs watcher status and retry starting it (ref #4552) (#4713)

cmd/syncthing/gui.go

@@ -112,6 +112,7 @@ type modelIntf interface {
 	State(folder string) (string, time.Time, error)
 	UsageReportingStats(version int, preview bool) map[string]interface{}
 	PullErrors(folder string) ([]model.FileError, error)
+	WatchError(folder string) error
 }
 
 type configIntf interface {
@@ -733,6 +734,11 @@ func folderSummary(cfg configIntf, m modelIntf, folder string) (map[string]inter
 		}
 	}
 
+	err = m.WatchError(folder)
+	if err != nil {
+		res["watchError"] = err.Error()
+	}
+
 	return res, nil
 }
 

cmd/syncthing/mocked_model_test.go

@@ -136,3 +136,7 @@ func (m *mockedModel) UsageReportingStats(version int, preview bool) map[string]
 func (m *mockedModel) PullErrors(folder string) ([]model.FileError, error) {
 	return nil, nil
 }
+
+func (m *mockedModel) WatchError(folder string) error {
+	return nil
+}