From 60078b8452867c9ab40c9623ef63169bdb090c83 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Thu, 9 Mar 2023 22:26:03 +0100 Subject: fswatcher: fix bsd support Fix the following error when running maildir on freebsd: could not create file system watcher: Unsupported OS: freebsd Do not register based on os type. Register based on supported API. Rename linux -> inotify and darwin -> fsevents. Only build fsevents on darwin, and inotify on all other platforms. Fixes: a0935a3de0ce ("worker/lib: implement an fswatcher interface") Reported-by: Jens Grassel Signed-off-by: Robin Jarry Tested-by: Jens Grassel --- worker/lib/watchers/inotify.go | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 worker/lib/watchers/inotify.go (limited to 'worker/lib/watchers/inotify.go') diff --git a/worker/lib/watchers/inotify.go b/worker/lib/watchers/inotify.go new file mode 100644 index 00000000..027ef4f2 --- /dev/null +++ b/worker/lib/watchers/inotify.go @@ -0,0 +1,76 @@ +//go:build !darwin +// +build !darwin + +package watchers + +import ( + "git.sr.ht/~rjarry/aerc/log" + "git.sr.ht/~rjarry/aerc/worker/handlers" + "git.sr.ht/~rjarry/aerc/worker/types" + "github.com/fsnotify/fsnotify" +) + +func init() { + handlers.RegisterWatcherFactory(newInotifyWatcher) +} + +type inotifyWatcher struct { + w *fsnotify.Watcher + ch chan *types.FSEvent +} + +func newInotifyWatcher() (types.FSWatcher, error) { + watcher := &inotifyWatcher{ + ch: make(chan *types.FSEvent), + } + w, err := fsnotify.NewWatcher() + if err != nil { + return nil, err + } + watcher.w = w + + go watcher.watch() + return watcher, nil +} + +func (w *inotifyWatcher) watch() { + defer log.PanicHandler() + for ev := range w.w.Events { + // we only care about files being created, removed or renamed + switch ev.Op { + case fsnotify.Create: + w.ch <- &types.FSEvent{ + Operation: types.FSCreate, + Path: ev.Name, + } + case fsnotify.Remove: + w.ch <- &types.FSEvent{ + Operation: types.FSRemove, + Path: ev.Name, + } + case fsnotify.Rename: + w.ch <- &types.FSEvent{ + Operation: types.FSRename, + Path: ev.Name, + } + default: + continue + } + } +} + +func (w *inotifyWatcher) Configure(root string) error { + return w.w.Add(root) +} + +func (w *inotifyWatcher) Events() chan *types.FSEvent { + return w.ch +} + +func (w *inotifyWatcher) Add(p string) error { + return w.w.Add(p) +} + +func (w *inotifyWatcher) Remove(p string) error { + return w.w.Remove(p) +} -- cgit