Extremely WIP, but now messages appear in the evolution list pane

internal/store/message.go

@@ -2,41 +2,49 @@ package store
 
 import (
 	"net/mail"
+
+	"github.com/asdine/storm/q"
 )
 
 type MessageInterface interface {
 	CreateMessage(Message) error
-	FindMessages(string, string) ([]Message, error)
+	FindMessages(Mailbox) ([]Message, error)
+
+	// if end == 0, it means "from start to most recent"
+	FindMessagesInRange(mailbox Mailbox, start, end uint64) ([]Message, error)
 }
 
 type Message struct {
-	ID       string
-	Username string `storm:"index"` // FK accounts.username
-	Mailbox  string `storm:"index"` // The mailbox, e.g. `INBOX` or `Foo/Bar`
+	// FIXME: this should be per-mailbox, IMAP "only" allows 32-bit message UIDs?
+	ID uint64 `storm:"id,increment"`
 
-	Header mail.Header
-	Body   []byte
+	Mailbox uint64 `storm:"index"` // FK mailbox.id
+
+	Header mail.Header // The parsed headers
+	EML    []byte      // The full email, unaltered
 }
 
 func (c *concrete) CreateMessage(message Message) error {
 	return c.storm.Save(&message)
 }
 
-func (c *concrete) FindMessages(username string, mailbox string) ([]Message, error) {
-	var messages []Message
+func (c *concrete) FindMessages(mailbox Mailbox) ([]Message, error) {
 	var out []Message
 
-	err := c.storm.Find("Username", username, &messages)
-	if err != nil {
-		return nil, err
-	}
-
-	// FIXME: I cannot storm, so I just filter out all non-mailbox messages
-	for _, message := range messages {
-		if message.Mailbox == mailbox {
-			out = append(out, message)
-		}
-	}
-
-	return out, nil
+	return out, c.storm.Find("Mailbox", mailbox.ID, &out)
+}
+
+func (c *concrete) FindMessagesInRange(mailbox Mailbox, start, end uint64) ([]Message, error) {
+	var out []Message
+
+	matchers := []q.Matcher{
+		q.Eq("Mailbox", mailbox.ID),
+		q.Gte("ID", start),
+	}
+
+	if end > 0 {
+		matchers = append(matchers, q.Lte("ID", end))
+	}
+
+	return out, c.storm.Select(matchers...).Find(&out)
 }