maildir: replace ListFolder method with FolderMap

Replace ListFolder with a new method that returns a map indexed by
folder names instead of a list of folder names. A map is simpler to use
and more efficient in case we only want to check the presence of a
specific folder in the Maildir store.

Signed-off-by: Julian Pidancet <julian.pidancet@oracle.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Acked-by: Tim Culverhouse <tim@timculverhouse.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go
index d2bb6464..a9c45ce8 100644
--- a/worker/maildir/worker.go
+++ b/worker/maildir/worker.go
@@ -329,12 +329,12 @@ func (w *Worker) handleListDirectories(msg *types.ListDirectories) error {
 	if w.c == nil {
 		return errors.New("Incorrect maildir directory")
 	}
-	dirs, err := w.c.Store.ListFolders()
+	dirs, err := w.c.Store.FolderMap()
 	if err != nil {
 		logging.Errorf("failed listing directories: %v", err)
 		return err
 	}
-	for _, name := range dirs {
+	for name := range dirs {
 		w.worker.PostMessage(&types.Directory{
 			Message: types.RespondTo(msg),
 			Dir: &models.Directory{
@@ -733,12 +733,12 @@ func (w *Worker) handleCheckMail(msg *types.CheckMail) {
 		if err != nil {
 			w.err(msg, fmt.Errorf("checkmail: error running command: %w", err))
 		} else {
-			dirs, err := w.c.Store.ListFolders()
+			dirs, err := w.c.Store.FolderMap()
 			if err != nil {
 				w.err(msg, fmt.Errorf("failed listing directories: %w", err))
 			}
-			for _, name := range dirs {
-				err := w.c.SyncNewMail(w.c.Store.Dir(name))
+			for name, dir := range dirs {
+				err := w.c.SyncNewMail(dir)
 				if err != nil {
 					w.err(msg, fmt.Errorf("could not sync new mail: %w", err))
 				}