lib: implement an eml message view

Implement a MessageView representation for eml data that are not stored
in a message store. With this, we can display any rfc822 message data in
the message viewer.

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

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/messageview.go b/lib/messageview.go
index 247cecbe..8507880b 100644
--- a/lib/messageview.go
+++ b/lib/messageview.go
@@ -28,6 +28,9 @@ type MessageView interface {
 	// Returns the message store that this message was originally sourced from
 	Store() *MessageStore
 
+	// Fetches the full message
+	FetchFull(cb func(io.Reader))
+
 	// Fetches a specific body part for this message
 	FetchBodyPart(part []int, cb func(io.Reader))
 
@@ -76,8 +79,8 @@ func NewMessageStoreView(messageInfo *models.MessageInfo, setSeen bool,
 	}
 
 	if usePGP(messageInfo.BodyStructure) {
-		store.FetchFull([]uint32{messageInfo.Uid}, func(fm *types.FullMessage) {
-			reader := lib.NewCRLFReader(fm.Content.Reader)
+		msv.FetchFull(func(fm io.Reader) {
+			reader := lib.NewCRLFReader(fm)
 			md, err := pgp.Decrypt(reader, decryptKeys)
 			if err != nil {
 				cb(nil, err)
@@ -130,8 +133,19 @@ func (msv *MessageStoreView) MessageDetails() *models.MessageDetails {
 	return msv.details
 }
 
+func (msv *MessageStoreView) FetchFull(cb func(io.Reader)) {
+	if msv.message == nil && msv.messageStore != nil {
+		msv.messageStore.FetchFull([]uint32{msv.messageInfo.Uid},
+			func(fm *types.FullMessage) {
+				cb(fm.Content.Reader)
+			})
+		return
+	}
+	cb(bytes.NewReader(msv.message))
+}
+
 func (msv *MessageStoreView) FetchBodyPart(part []int, cb func(io.Reader)) {
-	if msv.message == nil {
+	if msv.message == nil && msv.messageStore != nil {
 		msv.messageStore.FetchBodyPart(msv.messageInfo.Uid, part, cb)
 		return
 	}