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

internal/store/account.go

@@ -29,6 +29,9 @@ type Account struct {
 
 	// As generated by HashPassword
 	PasswordHash string
+
+	// Where to put messages by default. FK: mailbox.id
+	DefaultMailbox uint64
 }
 
 // HashPassword turns a plaintext password into a crypt()ed string, using bcrypt

internal/store/mailbox.go

@@ -0,0 +1,43 @@
+package store
+
+import (
+	"errors"
+)
+
+type MailboxInterface interface {
+	CreateMailbox(*Mailbox) error
+	FindMailbox(account Account, name string) (Mailbox, error)
+	FindMailboxes(account Account) ([]Mailbox, error)
+}
+
+type Mailbox struct {
+	ID      uint64 `storm:"id,increment"`
+	Account string `storm:"index"` // FK accounts.username
+	Name    string `storm:"index"`
+}
+
+func (c *concrete) CreateMailbox(mailbox *Mailbox) error {
+	return c.storm.Save(mailbox)
+}
+
+func (c *concrete) FindMailbox(account Account, name string) (Mailbox, error) {
+	// FIXME I don't know how to storm
+	candidates, err := c.FindMailboxes(account)
+	if err != nil {
+		return Mailbox{}, err
+	}
+
+	for _, mbox := range candidates {
+		if mbox.Name == name {
+			return mbox, nil
+		}
+	}
+
+	return Mailbox{}, errors.New("not found")
+}
+
+func (c *concrete) FindMailboxes(account Account) ([]Mailbox, error) {
+	var out []Mailbox
+
+	return out, c.storm.Find("Account", account.Username, &out)
+}

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)
 }

internal/store/spool.go

@@ -1,9 +1,10 @@
 package store
 
 import (
-	"fmt"
+	"bytes"
 	"io"
 	"io/ioutil"
+	"log"
 	"net/mail"
 )
 
@@ -14,31 +15,26 @@ type SpoolInterface interface {
 // FIXME: we don't actually spool for now, we just store it to each user's
 // mailbox. This might lead to oddness in the partial delivery case.
 func (c *concrete) SpoolMessage(recipients []Account, r io.Reader) error {
-	message, err := mail.ReadMessage(r)
+	data, err := ioutil.ReadAll(r)
 	if err != nil {
 		return err
 	}
 
-	// FIXME: we can assign our own ID in this case
-	mid := message.Header.Get("Message-ID")
-	if mid == "" {
-		return fmt.Errorf("No Message-ID for this email")
-	}
-
-	body, err := ioutil.ReadAll(message.Body)
+	message, err := mail.ReadMessage(bytes.NewReader(data))
 	if err != nil {
 		return err
 	}
 
 	for _, recipient := range recipients {
 		message := Message{
-			ID:       mid,
-			Username: recipient.Username,
-			Mailbox:  "INBOX", // FIXME: at some point this will be changeable
-			Header:   message.Header,
-			Body:     body,
+			Mailbox: recipient.DefaultMailbox,
+			Header:  message.Header,
+			EML:     data,
 		}
 
+		log.Printf("Creating email: %#v", message)
+		log.Print(string(data))
+
 		if err := c.CreateMessage(message); err != nil {
 			return err
 		}

internal/store/store.go

@@ -19,12 +19,17 @@ type Interface interface {
 	SetTLS([]byte, []byte) error
 
 	AccountInterface
+	MailboxInterface
 	MessageInterface
 	SpoolInterface
 
 	io.Closer
 }
 
+func IsNotFound(err error) bool {
+	return err.Error() == "not found" // Magic hardcoded value in storm
+}
+
 func New(ctx context.Context, filename string) (Interface, error) {
 	db, err := storm.Open(filename, storm.BoltOptions(0600, &bolt.Options{}))
 	if err != nil {