alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contacts-cache: return most relevant contacts

Browse Source 
Return in the contacts in *reverse* rank order, i.e. the most relevant come first.
This is useful since we only want the first maxnum contacts, and those should of
course be the most relevant.

Update mu cfind/server as well.

cfind
This commit is contained in:
Dirk-Jan C. Binnema
2022-05-09 21:17:03 +03:00
parent 80d84bf635
commit 81689f0af3
5 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/mu-server.cc
View File

@ -532,30 +532,25 @@ Server::Private::contacts_handler(const Parameters& params)
time_to_string("%c", after).c_str(),
static_cast<size_t>(tstamp));
auto rank{0};
auto n{0};
Sexp::List contacts;
store().contacts_cache().for_each([&](const Contact& ci) {
/* since the last time we got some contacts */
if (tstamp > ci.tstamp)
return;
return true;
/* (maybe) only include 'personal' contacts */
if (personal && !ci.personal)
return;
return true;
/* only include newer-than-x contacts */
if (after > ci.message_date)
return;
return true;
rank++;
n++;
Sexp::List contact;
contact.add_prop(":address",
Sexp::make_string(ci.display_name(true/*encode-if-needed*/)));
contact.add_prop(":rank", Sexp::make_number(rank));
auto contacts_sexp{Sexp::make_list(std::move(contact))};
contacts_sexp.formatting_opts |= Sexp::FormattingOptions::SplitList;
contacts.add(std::move(contacts_sexp));
}, static_cast<size_t>(maxnum));
contacts.add(Sexp::make_string(ci.display_name(true/*encode-if-needed*/)));
return maxnum == 0 || n < maxnum;
});
Sexp::List seq;
seq.add_prop(":contacts", Sexp::make_list(std::move(contacts)));
@ -564,7 +559,7 @@ Server::Private::contacts_handler(const Parameters& params)
g_get_monotonic_time())));
/* dump the contacts cache as a giant sexp */
g_debug("sending %d of %zu contact(s)", rank, store().contacts_cache().size());
g_debug("sending %d of %zu contact(s)", n, store().contacts_cache().size());
output_sexp(std::move(seq), Server::OutputFlags::SplitList);
}