From d3379dd7f0d2e5caffeda4a97fc72649421cccca Mon Sep 17 00:00:00 2001 From: Jeffas Date: Wed, 2 Oct 2019 17:16:15 +0100 Subject: Preserve sorting order in search results This ensures that the search results follow the order of the current sort so that cycling throught the results proceeds in displayed order. --- lib/sort/sort.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'lib/sort/sort.go') diff --git a/lib/sort/sort.go b/lib/sort/sort.go index 89c36a9..840f77e 100644 --- a/lib/sort/sort.go +++ b/lib/sort/sort.go @@ -3,6 +3,7 @@ package sort import ( "errors" "fmt" + "sort" "strings" "git.sr.ht/~sircmpwn/aerc/worker/types" @@ -54,3 +55,18 @@ func parseSortField(arg string) (types.SortField, error) { return types.SortArrival, fmt.Errorf("%v is not a valid sort criterion", arg) } } + +// Sorts toSort by sortBy so that toSort becomes a permutation following the +// order of sortBy. +// toSort should be a subset of sortBy +func SortBy(toSort []uint32, sortBy []uint32) { + // build a map from sortBy + uidMap := make(map[uint32]int) + for i, uid := range sortBy { + uidMap[uid] = i + } + // sortslice of toSort with less function of indexing the map sortBy + sort.Slice(toSort, func(i, j int) bool { + return uidMap[toSort[i]] < uidMap[toSort[j]] + }) +} -- cgit v1.2.3