We need to emit the changed msgInfo whenever we modify the state
---
Easiest way to do that is to simply emit the fetchHeaders action.
Any objections in doing that?
worker/imap/flags.go | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/worker/imap/flags.go b/worker/imap/flags.go
index 57211a6..011cf54 100644
--- a/worker/imap/flags.go
+++ b/worker/imap/flags.go
@@ -1,6 +1,7 @@
package imap
import (
+ "fmt"
"github.com/emersion/go-imap"
"git.sr.ht/~sircmpwn/aerc/worker/types"
@@ -51,12 +52,26 @@ func (imapw *IMAPWorker) handleReadMessages(msg *types.ReadMessages) {
flags = []interface{}{imap.SeenFlag}
}
uids := toSeqSet(msg.Uids)
- if err := imapw.client.UidStore(uids, item, flags, nil); err != nil {
+ emitErr := func(err error) {
imapw.worker.PostMessage(&types.Error{
Message: types.RespondTo(msg),
Error: err,
}, nil)
+ }
+ if err := imapw.client.UidStore(uids, item, flags, nil); err != nil {
+ emitErr(err)
return
}
- imapw.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil)
+ imapw.worker.PostAction(&types.FetchMessageHeaders{
+ Uids: msg.Uids,
+ }, func(msg types.WorkerMessage) {
+ switch m := msg.(type) {
+ case *types.Error:
+ err := fmt.Errorf("handleReadMessages: %v", m.Error)
+ imapw.worker.Logger.Printf("could not fetch headers: %s", err)
+ emitErr(err)
+ case *types.Done:
+ imapw.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil)
+ }
+ })
}
--
2.25.0
On Thu Jan 23, 2020 at 08:17, Reto Brunner wrote:
> - imapw.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil)
> + imapw.worker.PostAction(&types.FetchMessageHeaders{
> + Uids: msg.Uids,
> + }, func(msg types.WorkerMessage) {
> + switch m := msg.(type) {
> + case *types.Error:
> + err := fmt.Errorf("handleReadMessages: %v", m.Error)
> + imapw.worker.Logger.Printf("could not fetch headers: %s", err)
> + emitErr(err)
> + case *types.Done:
> + imapw.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil)
Note that the msg parameter from the callback is shadowing here, so the
original message won't get a Done.