rmdir: ensure proper sequence of operations

Ensure the proper sequence of opening and removing a directory. Fix a
potential race between the OpenDirectory (issued by dirlist.Select())
and the RemoveDirectory messages when removing a directory.

Due to the delay in the current dirlist.Select() function, the
RemoveDirectory message can arrive at the backend before the directory
was changed to a different one. This can cause an error on some imap
servers and problems with the watcher on the maildir backends.

Introduce dirlist.Open() that accepts a callback function so that the
operations can be performed in proper sequence. Dirlist.Select() is now
a wrapper call to dirlist.Open().

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

1 files changed, 17 insertions, 3 deletions

diff --git a/app/dirtree.go b/app/dirtree.go
index 50f5797f..6a3b34c0 100644
--- a/app/dirtree.go
+++ b/app/dirtree.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	"git.sr.ht/~rjarry/aerc/config"
 	"git.sr.ht/~rjarry/aerc/lib"
@@ -50,11 +51,14 @@ func (dt *DirectoryTree) Update(msg types.WorkerMessage) {
 	switch msg := msg.(type) {
 
 	case *types.Done:
-		switch msg.InResponseTo().(type) {
+		switch resp := msg.InResponseTo().(type) {
 		case *types.RemoveDirectory, *types.ListDirectories, *types.CreateDirectory:
 			dt.DirectoryList.Update(msg)
 			dt.buildTree()
 			dt.Invalidate()
+		case *types.OpenDirectory:
+			dt.reindex(resp.Directory)
+			dt.DirectoryList.Update(msg)
 		default:
 			dt.DirectoryList.Update(msg)
 		}
@@ -196,7 +200,7 @@ func (dt *DirectoryTree) SelectedMsgStore() (*lib.MessageStore, bool) {
 	return dt.DirectoryList.SelectedMsgStore()
 }
 
-func (dt *DirectoryTree) Select(name string) {
+func (dt *DirectoryTree) reindex(name string) {
 	idx := findString(dt.treeDirs, name)
 	if idx >= 0 {
 		selIdx, node := dt.getTreeNode(uint32(idx))
@@ -205,14 +209,24 @@ func (dt *DirectoryTree) Select(name string) {
 			dt.listIdx = selIdx
 		}
 	}
+}
 
+func (dt *DirectoryTree) Select(name string) {
 	if name == "" {
 		return
 	}
-
+	dt.reindex(name)
 	dt.DirectoryList.Select(name)
 }
 
+func (dt *DirectoryTree) Open(name string, delay time.Duration, cb func(types.WorkerMessage)) {
+	if name == "" {
+		return
+	}
+	dt.reindex(name)
+	dt.DirectoryList.Open(name, delay, cb)
+}
+
 func (dt *DirectoryTree) NextPrev(delta int) {
 	newIdx := dt.listIdx
 	ndirs := len(dt.list)