26b9c3d966
Use the capabilities returned by the backend to check whether sort is implemented when the user tries to use the sort command. Print a warning to the log when a sort request is silently dropped by the backend. Suggested-by: |cos| Signed-off-by: Koni Marti <koni.marti@gmail.com> Acked-by: Robin Jarry <robin@jarry.cc>
166 lines
4.3 KiB
Go
166 lines
4.3 KiB
Go
package imap
|
|
|
|
import (
|
|
"sort"
|
|
|
|
sortthread "github.com/emersion/go-imap-sortthread"
|
|
|
|
"git.sr.ht/~rjarry/aerc/logging"
|
|
"git.sr.ht/~rjarry/aerc/worker/types"
|
|
)
|
|
|
|
func (imapw *IMAPWorker) handleOpenDirectory(msg *types.OpenDirectory) {
|
|
logging.Infof("Opening %s", msg.Directory)
|
|
|
|
sel, err := imapw.client.Select(msg.Directory, false)
|
|
if err != nil {
|
|
imapw.worker.PostMessage(&types.Error{
|
|
Message: types.RespondTo(msg),
|
|
Error: err,
|
|
}, nil)
|
|
} else {
|
|
imapw.selected = sel
|
|
imapw.worker.PostMessage(&types.Done{Message: types.RespondTo(msg)}, nil)
|
|
}
|
|
}
|
|
|
|
func (imapw *IMAPWorker) handleFetchDirectoryContents(
|
|
msg *types.FetchDirectoryContents) {
|
|
|
|
logging.Infof("Fetching UID list")
|
|
|
|
searchCriteria, err := parseSearch(msg.FilterCriteria)
|
|
if err != nil {
|
|
imapw.worker.PostMessage(&types.Error{
|
|
Message: types.RespondTo(msg),
|
|
Error: err,
|
|
}, nil)
|
|
return
|
|
}
|
|
sortCriteria := translateSortCriterions(msg.SortCriteria)
|
|
|
|
var uids []uint32
|
|
|
|
// If the server supports the SORT extension, do the sorting server side
|
|
ok, err := imapw.client.sort.SupportSort()
|
|
if err == nil && ok && len(sortCriteria) > 0 {
|
|
uids, err = imapw.client.sort.UidSort(sortCriteria, searchCriteria)
|
|
// copy in reverse as msgList displays backwards
|
|
for i, j := 0, len(uids)-1; i < j; i, j = i+1, j-1 {
|
|
uids[i], uids[j] = uids[j], uids[i]
|
|
}
|
|
} else {
|
|
if err != nil {
|
|
// Non fatal, but we do want to print to get some debug info
|
|
logging.Errorf("can't check for SORT support: %v", err)
|
|
} else if len(sortCriteria) > 0 {
|
|
logging.Warnf("SORT is not supported but requested: list messages by UID")
|
|
}
|
|
uids, err = imapw.client.UidSearch(searchCriteria)
|
|
}
|
|
if err != nil {
|
|
imapw.worker.PostMessage(&types.Error{
|
|
Message: types.RespondTo(msg),
|
|
Error: err,
|
|
}, nil)
|
|
} else {
|
|
logging.Infof("Found %d UIDs", len(uids))
|
|
imapw.seqMap.Clear()
|
|
imapw.worker.PostMessage(&types.DirectoryContents{
|
|
Message: types.RespondTo(msg),
|
|
Uids: uids,
|
|
}, nil)
|
|
imapw.worker.PostMessage(&types.Done{Message: types.RespondTo(msg)}, nil)
|
|
}
|
|
}
|
|
|
|
type sortFieldMapT map[types.SortField]sortthread.SortField
|
|
|
|
// caution, incomplete mapping
|
|
var sortFieldMap sortFieldMapT = sortFieldMapT{
|
|
types.SortArrival: sortthread.SortArrival,
|
|
types.SortCc: sortthread.SortCc,
|
|
types.SortDate: sortthread.SortDate,
|
|
types.SortFrom: sortthread.SortFrom,
|
|
types.SortSize: sortthread.SortSize,
|
|
types.SortSubject: sortthread.SortSubject,
|
|
types.SortTo: sortthread.SortTo,
|
|
}
|
|
|
|
func translateSortCriterions(
|
|
cs []*types.SortCriterion) []sortthread.SortCriterion {
|
|
result := make([]sortthread.SortCriterion, 0, len(cs))
|
|
for _, c := range cs {
|
|
if f, ok := sortFieldMap[c.Field]; ok {
|
|
result = append(result, sortthread.SortCriterion{Field: f, Reverse: c.Reverse})
|
|
}
|
|
}
|
|
return result
|
|
}
|
|
|
|
func (imapw *IMAPWorker) handleDirectoryThreaded(
|
|
msg *types.FetchDirectoryThreaded) {
|
|
logging.Infof("Fetching threaded UID list")
|
|
|
|
searchCriteria, err := parseSearch(msg.FilterCriteria)
|
|
if err != nil {
|
|
imapw.worker.PostMessage(&types.Error{
|
|
Message: types.RespondTo(msg),
|
|
Error: err,
|
|
}, nil)
|
|
return
|
|
}
|
|
threads, err := imapw.client.thread.UidThread(sortthread.References,
|
|
searchCriteria)
|
|
if err != nil {
|
|
imapw.worker.PostMessage(&types.Error{
|
|
Message: types.RespondTo(msg),
|
|
Error: err,
|
|
}, nil)
|
|
} else {
|
|
aercThreads, count := convertThreads(threads, nil)
|
|
sort.Sort(types.ByUID(aercThreads))
|
|
logging.Infof("Found %d threaded messages", count)
|
|
imapw.seqMap.Clear()
|
|
imapw.worker.PostMessage(&types.DirectoryThreaded{
|
|
Message: types.RespondTo(msg),
|
|
Threads: aercThreads,
|
|
}, nil)
|
|
imapw.worker.PostMessage(&types.Done{Message: types.RespondTo(msg)}, nil)
|
|
}
|
|
}
|
|
|
|
func convertThreads(threads []*sortthread.Thread, parent *types.Thread) ([]*types.Thread, int) {
|
|
if threads == nil {
|
|
return nil, 0
|
|
}
|
|
conv := make([]*types.Thread, len(threads))
|
|
count := 0
|
|
|
|
for i := 0; i < len(threads); i++ {
|
|
t := threads[i]
|
|
conv[i] = &types.Thread{
|
|
Uid: t.Id,
|
|
}
|
|
|
|
// Set the first child node
|
|
children, childCount := convertThreads(t.Children, conv[i])
|
|
if len(children) > 0 {
|
|
conv[i].FirstChild = children[0]
|
|
}
|
|
|
|
// Set the parent node
|
|
if parent != nil {
|
|
conv[i].Parent = parent
|
|
|
|
// elements of threads are siblings
|
|
if i > 0 {
|
|
conv[i].PrevSibling = conv[i-1]
|
|
conv[i-1].NextSibling = conv[i]
|
|
}
|
|
}
|
|
|
|
count += childCount + 1
|
|
}
|
|
return conv, count
|
|
}
|