Add body fetching support code

This commit is contained in:
Drew DeVault 2019-03-29 22:35:53 -04:00
commit 77ede6eb5a
9 changed files with 165 additions and 24 deletions
worker/imap

View file

@ -2,6 +2,7 @@ package imap
import (
"github.com/emersion/go-imap"
"github.com/mohamedattahri/mail"
"git.sr.ht/~sircmpwn/aerc2/worker/types"
)
@ -10,28 +11,58 @@ func (imapw *IMAPWorker) handleFetchMessageHeaders(
msg *types.FetchMessageHeaders) {
imapw.worker.Logger.Printf("Fetching message headers")
items := []imap.FetchItem{
imap.FetchEnvelope,
imap.FetchInternalDate,
imap.FetchFlags,
imap.FetchUid,
}
imapw.handleFetchMessages(msg, &msg.Uids, items)
}
func (imapw *IMAPWorker) handleFetchMessageBodies(
msg *types.FetchMessageBodies) {
imapw.worker.Logger.Printf("Fetching message bodies")
section := &imap.BodySectionName{}
items := []imap.FetchItem{section.FetchItem()}
imapw.handleFetchMessages(msg, &msg.Uids, items)
}
func (imapw *IMAPWorker) handleFetchMessages(
msg types.WorkerMessage, uids *imap.SeqSet, items []imap.FetchItem) {
go func() {
messages := make(chan *imap.Message)
done := make(chan error, 1)
items := []imap.FetchItem{
imap.FetchEnvelope,
imap.FetchInternalDate,
imap.FetchFlags,
imap.FetchUid,
}
go func() {
done <- imapw.client.UidFetch(&msg.Uids, items, messages)
done <- imapw.client.UidFetch(uids, items, messages)
}()
go func() {
for msg := range messages {
imapw.seqMap[msg.SeqNum-1] = msg.Uid
imapw.worker.PostMessage(&types.MessageInfo{
Envelope: msg.Envelope,
Flags: msg.Flags,
InternalDate: msg.InternalDate,
Uid: msg.Uid,
}, nil)
section := &imap.BodySectionName{}
for _msg := range messages {
imapw.seqMap[_msg.SeqNum-1] = _msg.Uid
if reader := _msg.GetBody(section); reader != nil {
email, err := mail.ReadMessage(reader)
if err != nil {
imapw.worker.PostMessage(&types.Error{
Message: types.RespondTo(msg),
Error: err,
}, nil)
}
imapw.worker.PostMessage(&types.MessageBody{
Mail: email,
Uid: _msg.Uid,
}, nil)
} else {
imapw.worker.PostMessage(&types.MessageInfo{
Envelope: _msg.Envelope,
Flags: _msg.Flags,
InternalDate: _msg.InternalDate,
Uid: _msg.Uid,
}, nil)
}
}
if err := <-done; err != nil {
imapw.worker.PostMessage(&types.Error{