Fix mailbox UI sorting and target layout

backend/00-router.go

@@ -1414,14 +1414,14 @@ func renderTargetEmailBoxPage(w http.ResponseWriter, r *http.Request, accounts [
 </aside>
 <button class="backstage-shade" type="button" aria-label="Menue schliessen" data-backstage-close></button>
 <div class="three-pane email-box-view email-box-target-view">
-  <section class="pane pane-list" id="list">%s</section>
-  <div class="pane-resizer" data-resize-index="0"></div>
   <section class="pane pane-read" id="read">%s</section>
+  <div class="pane-resizer" data-resize-index="0"></div>
+  <section class="pane pane-list" id="list">%s</section>
   <div class="pane-resizer" data-resize-index="1"></div>
   <aside class="pane pane-tree" id="target-tree">%s</aside>
 </div>
 <footer class="statusbar"><span id="mig-status" hx-get="/migrate/status" hx-trigger="load,every 3s" hx-swap="innerHTML">bereit</span></footer></body></html>`,
-		renderRibbonEmailBoxMenu("target"), renderRibbonTransferMenu(""), renderRibbonActions(false, user), renderInitialTargetMailboxList(selectedAccount), renderInitialTargetMailboxRead(selectedAccount), renderEmailBoxTargetPane(accounts, selectedAccount.Name))
+		renderRibbonEmailBoxMenu("target"), renderRibbonTransferMenu(""), renderRibbonActions(false, user), renderInitialTargetMailboxRead(selectedAccount), renderInitialTargetMailboxList(selectedAccount), renderEmailBoxTargetPane(accounts, selectedAccount.Name))
 }
 
 func renderEmailBoxSourcePane(accounts []Account, selected string) string {

backend/04-imap-source.go

@@ -51,6 +51,7 @@ type SourceMailbox interface {
 	Folders() ([]Folder, error) // rekursiver Ordnerbaum
 	Count(folder string) (int, error)
 	Headers(folder string, limit, offset int) ([]MessageHeader, error)
+	AllHeaders(folder string) ([]MessageHeader, error)
 	FetchOne(folder string, uid uint32) (RawMessage, error)
 	Fetch(folder string, fn func(RawMessage) error) error // BODY[] FLAGS INTERNALDATE
 	Close() error
@@ -102,6 +103,10 @@ func (s *imapSource) Headers(folder string, limit, offset int) ([]MessageHeader,
 	return s.mailbox.fetchHeaders(folder, limit, offset)
 }
 
+func (s *imapSource) AllHeaders(folder string) ([]MessageHeader, error) {
+	return s.mailbox.fetchAllHeadersByUID(folder)
+}
+
 func (s *imapSource) FetchOne(folder string, uid uint32) (RawMessage, error) {
 	return s.mailbox.fetchOne(folder, uid)
 }
@@ -208,56 +213,25 @@ func (m *imapClientMailbox) count(folder string) (int, error) {
 }
 
 func (m *imapClientMailbox) fetchHeaders(folder string, limit, offset int) ([]MessageHeader, error) {
-	selected, err := m.c.Select(folder, &imap.SelectOptions{ReadOnly: true}).Wait()
-	if err != nil {
-		return nil, err
-	}
-	if selected.NumMessages == 0 {
-		return nil, nil
-	}
 	if limit <= 0 || limit > 200 {
 		limit = 200
 	}
 	if offset < 0 {
 		offset = 0
 	}
-	stop := int(selected.NumMessages) - offset
-	if stop <= 0 {
+	headers, err := m.fetchAllHeadersByUID(folder)
+	if err != nil {
+		return nil, err
+	}
+	sortMessageHeadersByDateDesc(headers)
+	if offset >= len(headers) {
 		return nil, nil
 	}
-	start := stop - limit + 1
-	if start < 1 {
-		start = 1
+	end := offset + limit
+	if end > len(headers) {
+		end = len(headers)
 	}
-
-	seqSet := imap.SeqSet{}
-	seqSet.AddRange(uint32(start), uint32(stop))
-	cmd := m.c.Fetch(seqSet, &imap.FetchOptions{
-		Envelope:     true,
-		Flags:        true,
-		InternalDate: true,
-		RFC822Size:   true,
-		UID:          true,
-	})
-	defer cmd.Close()
-
-	var out []MessageHeader
-	for {
-		data := cmd.Next()
-		if data == nil {
-			break
-		}
-		buf, err := data.Collect()
-		if err != nil {
-			return out, err
-		}
-		out = append(out, messageHeaderFromFetch(buf))
-	}
-	if err := cmd.Close(); err != nil {
-		return out, err
-	}
-	reverseHeaders(out)
-	return out, nil
+	return headers[offset:end], nil
 }
 
 func (m *imapClientMailbox) fetchAllHeadersByUID(folder string) ([]MessageHeader, error) {
@@ -463,6 +437,24 @@ func sortMessageHeadersByUID(headers []MessageHeader) {
 	})
 }
 
+func sortMessageHeadersByDateDesc(headers []MessageHeader) {
+	sort.SliceStable(headers, func(i, j int) bool {
+		di := headerSortDate(headers[i])
+		dj := headerSortDate(headers[j])
+		if !di.Equal(dj) {
+			return di.After(dj)
+		}
+		return headers[i].UID > headers[j].UID
+	})
+}
+
+func headerSortDate(h MessageHeader) time.Time {
+	if !h.Date.IsZero() {
+		return h.Date
+	}
+	return h.InternalDate
+}
+
 func messageIDFromFetch(buf *imapclient.FetchMessageBuffer, body []byte) string {
 	if buf != nil && buf.Envelope != nil && strings.TrimSpace(buf.Envelope.MessageID) != "" {
 		return normalizeMessageID(buf.Envelope.MessageID)

backend/06-mbox.go

@@ -12,6 +12,7 @@ import (
 	"net/mail"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"time"
 
@@ -166,6 +167,7 @@ func ReadMboxList(path string) ([]MboxEntry, error) {
 			Date:    decodeHeader(msg.Header.Get("Date")),
 		})
 	}
+	sortMboxEntriesByDateDesc(out)
 	return out, nil
 }
 
@@ -467,6 +469,14 @@ func readMboxListFromIndex(path string) ([]MboxEntry, bool) {
 	if err != nil || len(index) == 0 {
 		return nil, false
 	}
+	sort.SliceStable(index, func(i, j int) bool {
+		di := parseMboxIndexDate(index[i].Date)
+		dj := parseMboxIndexDate(index[j].Date)
+		if !di.Equal(dj) {
+			return di.After(dj)
+		}
+		return index[i].Seq > index[j].Seq
+	})
 	out := make([]MboxEntry, 0, len(index))
 	for _, entry := range index {
 		out = append(out, MboxEntry{
@@ -479,6 +489,25 @@ func readMboxListFromIndex(path string) ([]MboxEntry, bool) {
 	return out, true
 }
 
+func sortMboxEntriesByDateDesc(entries []MboxEntry) {
+	sort.SliceStable(entries, func(i, j int) bool {
+		di := parseMboxIndexDate(entries[i].Date)
+		dj := parseMboxIndexDate(entries[j].Date)
+		if !di.Equal(dj) {
+			return di.After(dj)
+		}
+		return entries[i].Index > entries[j].Index
+	})
+}
+
+func parseMboxIndexDate(value string) time.Time {
+	t, err := mail.ParseDate(strings.TrimSpace(value))
+	if err == nil {
+		return t
+	}
+	return time.Time{}
+}
+
 func readMboxMessageFromIndex(path string, index int) ([]byte, bool, error) {
 	accountID, folder, ok := mboxIndexContext(path)
 	if !ok {

backend/06-mbox_test.go

@@ -198,7 +198,7 @@ func TestPlainMboxPartialIndexIsRebuiltBeforeList(t *testing.T) {
 	if len(entries) != 2 {
 		t.Fatalf("expected rebuilt full list with 2 entries, got %#v", entries)
 	}
-	if entries[0].Subject != "First" || entries[1].Subject != "Second" {
+	if entries[0].Subject != "Second" || entries[1].Subject != "First" {
 		t.Fatalf("unexpected entries after reindex: %#v", entries)
 	}
 }

backend/08-viewer.go

@@ -223,6 +223,12 @@ func archiveFolderInfos(paths []string) []archiveFolderInfo {
 
 func archiveFolderLabel(name string) string {
 	name = strings.TrimSpace(name)
+	if label := folderRoleLabel(RoleFromName(name, ".")); label != "" {
+		return label
+	}
+	if label := folderRoleLabel(RoleFromName(name, "/")); label != "" {
+		return label
+	}
 	switch strings.ToLower(name) {
 	case "", "inbox":
 		return "Posteingang"
@@ -238,7 +244,7 @@ func archiveFolderLabel(name string) string {
 		return "Spam"
 	}
 	parts := strings.FieldsFunc(name, func(r rune) bool {
-		return r == '/' || r == '\\'
+		return r == '/' || r == '\\' || r == '.'
 	})
 	if len(parts) == 0 {
 		parts = strings.Split(name, "_")
@@ -250,8 +256,43 @@ func archiveFolderLabel(name string) string {
 	return label
 }
 
+func folderRoleLabel(role FolderRole) string {
+	switch role {
+	case RoleInbox:
+		return "Posteingang"
+	case RoleSent:
+		return "Gesendet"
+	case RoleDrafts:
+		return "Entwürfe"
+	case RoleTrash:
+		return "Papierkorb"
+	case RoleJunk:
+		return "Spam"
+	case RoleArchive:
+		return "Archiv"
+	case RoleOutbox:
+		return "Postausgang"
+	default:
+		return ""
+	}
+}
+
 func archiveFolderSortKey(name string) string {
 	lc := strings.ToLower(strings.TrimSpace(name))
+	switch RoleFromName(name, ".") {
+	case RoleInbox:
+		return "00:" + lc
+	case RoleDrafts:
+		return "01:" + lc
+	case RoleSent:
+		return "02:" + lc
+	case RoleJunk:
+		return "03:" + lc
+	case RoleTrash:
+		return "04:" + lc
+	case RoleArchive:
+		return "05:" + lc
+	}
 	switch lc {
 	case "inbox":
 		return "00:" + lc