maildir: keep less data in memory for sorting

Sorting opens and reads portions of every file within a directory in
order to gather the data needed. Specifically, RFC822Headers and
BodyStructure are not needed. The RFC822Headers field stores a lot of
information, and the BodyStructure field requires parsing the body of
the email.

Don't set these two values when parsing.

Note: in my testing, this dropped sorting a 52k archive from 2.2gb of
ram usage, to < 500mb

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>

2 files changed, 19 insertions, 1 deletions

diff --git a/worker/maildir/message.go b/worker/maildir/message.go
index 3c8ce9ef..d9433823 100644
--- a/worker/maildir/message.go
+++ b/worker/maildir/message.go
@@ -76,6 +76,12 @@ func (m Message) MessageInfo() (*models.MessageInfo, error) {
 	return lib.MessageInfo(m)
 }
 
+// MessageHeaders populates a models.MessageInfo struct for the message with
+// minimal information, used for sorting and threading.
+func (m Message) MessageHeaders() (*models.MessageInfo, error) {
+	return lib.MessageHeaders(m)
+}
+
 // NewBodyPartReader creates a new io.Reader for the requested body part(s) of
 // the message.
 func (m Message) NewBodyPartReader(requestedParts []int) (io.Reader, error) {
diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go
index 30faddac..de7e8e89 100644
--- a/worker/maildir/worker.go
+++ b/worker/maildir/worker.go
@@ -448,7 +448,7 @@ func (w *Worker) sort(uids []uint32, criteria []*types.SortCriterion) ([]uint32,
 		wg.Add(1)
 		go func(uid uint32) {
 			defer wg.Done()
-			info, err := w.msgInfoFromUid(uid)
+			info, err := w.msgHeadersFromUid(uid)
 			if err != nil {
 				logging.Errorf("could not get message info: %v", err)
 				return
@@ -729,6 +729,18 @@ func (w *Worker) msgInfoFromUid(uid uint32) (*models.MessageInfo, error) {
 	return info, nil
 }
 
+func (w *Worker) msgHeadersFromUid(uid uint32) (*models.MessageInfo, error) {
+	m, err := w.c.Message(*w.selected, uid)
+	if err != nil {
+		return nil, err
+	}
+	info, err := m.MessageHeaders()
+	if err != nil {
+		return nil, err
+	}
+	return info, nil
+}
+
 func (w *Worker) handleCheckMail(msg *types.CheckMail) {
 	if msg.Command == "" {
 		w.err(msg, fmt.Errorf("checkmail: no command specified"))