_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix out-of-order messages by sorting as we display" 

This reverts commit ac99d9ed62.
This commit is contained in:
Drew DeVault 2019-09-18 10:21:45 -04:00
parent 35dc57ed90
commit 956f1366a5
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/msgstore.go
View File

@ -13,7 +13,7 @@ type MessageStore struct {
Deleted map[uint32]interface{}
DirInfo models.DirectoryInfo
Messages map[uint32]*models.MessageInfo
// List of known UIDs, order is not important
// Ordered list of known UIDs
uids []uint32
selected int

31
widgets/msglist.go
View File

@ -3,7 +3,6 @@ package widgets
import (
"fmt"
"log"
"sort"
"github.com/gdamore/tcell"
"github.com/mattn/go-runewidth"
@ -28,34 +27,6 @@ type MessageList struct {
aerc *Aerc
}
type msgSorter struct {
uids []uint32
store *lib.MessageStore
}
func (s *msgSorter) Len() int {
return len(s.uids)
}
func (s *msgSorter) Less(i, j int) bool {
msgI := s.store.Messages[s.uids[i]]
msgJ := s.store.Messages[s.uids[j]]
if msgI == nil && msgJ == nil {
return false // doesn't matter which order among nulls
} else if msgI == nil && msgJ != nil {
return true // say i is before j so we sort i to bottom
} else if msgI != nil && msgJ == nil {
return false // say i is after j so we sort j to bottom
}
return msgI.InternalDate.Before(msgJ.InternalDate)
}
func (s *msgSorter) Swap(i, j int) {
tmp := s.uids[i]
s.uids[i] = s.uids[j]
s.uids[j] = tmp
}
func NewMessageList(conf *config.AercConfig, logger *log.Logger, aerc *Aerc) *MessageList {
ml := &MessageList{
conf: conf,
@ -97,8 +68,6 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
row int = 0
)
uids := store.Uids()
sorter := msgSorter{uids: uids, store: store}
sort.Stable(&sorter)
for i := len(uids) - 1 - ml.scroll; i >= 0; i-- {
uid := uids[i]