notmuch: remove dynamic folders

Remove dynamic folders in the notmuch backends with the :rmdir command.
Dynamic folders can be created by the :cf command but they cannot be
removed again unless you restart aerc or use it in combination with a
maildir-store.

Signed-off-by: Koni Marti <koni.marti@gmail.com>
Tested-by: Inwit <inwit@sindominio.net>
Acked-by: Robin Jarry <robin@jarry.cc>

1 files changed, 7 insertions, 1 deletions

diff --git a/worker/notmuch/worker.go b/worker/notmuch/worker.go
index 486312a1..374a20b7 100644
--- a/worker/notmuch/worker.go
+++ b/worker/notmuch/worker.go
@@ -920,10 +920,16 @@ func (w *worker) handleCreateDirectory(msg *types.CreateDirectory) error {
 }
 
 func (w *worker) handleRemoveDirectory(msg *types.RemoveDirectory) error {
-	if w.store == nil {
+	_, inQueryMap := w.nameQueryMap[msg.Directory]
+	if inQueryMap {
 		return errUnsupported
 	}
 
+	if w.store == nil {
+		w.done(msg)
+		return nil
+	}
+
 	dir := w.store.Dir(msg.Directory)
 	if err := os.RemoveAll(string(dir)); err != nil {
 		w.w.Errorf("could not remove directory %s: %v",