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

server: find_handler: better handle sort-field-id

Browse Source 
Handle invalid sort-fields correctly.
This commit is contained in:
Dirk-Jan C. Binnema
2023-01-29 09:09:17 +02:00
parent a8daec9598
commit 29dc90486b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/mu-server.cc
View File

@ -659,21 +659,25 @@ Server::Private::find_handler(const Command& cmd)
const auto threads{cmd.boolean_arg(":threads")}; const auto threads{cmd.boolean_arg(":threads")};
// perhaps let mu4e set this as frame-lines of the appropriate frame. // perhaps let mu4e set this as frame-lines of the appropriate frame.
const auto batch_size{cmd.number_arg(":batch-size").value_or(110)}; const auto batch_size{cmd.number_arg(":batch-size").value_or(110)};
const auto sortfieldstr{cmd.symbol_arg(":sortfield").value_or("")};
const auto descending{cmd.boolean_arg(":descending")}; const auto descending{cmd.boolean_arg(":descending")};
const auto maxnum{cmd.number_arg(":maxnum").value_or(-1) /*unlimited*/}; const auto maxnum{cmd.number_arg(":maxnum").value_or(-1) /*unlimited*/};
const auto skip_dups{cmd.boolean_arg(":skip-dups")}; const auto skip_dups{cmd.boolean_arg(":skip-dups")};
const auto include_related{cmd.boolean_arg(":include-related")}; const auto include_related{cmd.boolean_arg(":include-related")};
auto sort_field = std::invoke([&]()->Option<Field>{ // complicated!
if (sortfieldstr.size() < 2) auto sort_field_id = std::invoke([&]()->Field::Id {
return Nothing; if (const auto arg = cmd.symbol_arg(":sortfield"); !arg)
return Field::Id::Date;
else if (arg->length() < 2)
throw Error{Error::Code::InvalidArgument, "invalid sort field '%s'",
arg->c_str()};
else if (const auto field{field_from_name(arg->substr(1))}; !field)
throw Error{Error::Code::InvalidArgument, "invalid sort field '%s'",
arg->c_str()};
else else
return field_from_name(sortfieldstr.substr(1)); return field->id;
}); });
if (!sort_field && !sortfieldstr.empty())
throw Error{Error::Code::InvalidArgument, "invalid sort field '%s'",
sortfieldstr.c_str()};
if (batch_size < 1) if (batch_size < 1)
throw Error{Error::Code::InvalidArgument, "invalid batch-size %d", batch_size}; throw Error{Error::Code::InvalidArgument, "invalid batch-size %d", batch_size};
@ -691,9 +695,9 @@ Server::Private::find_handler(const Command& cmd)
indexer().is_running() ? "yes" : "no")}; indexer().is_running() ? "yes" : "no")};
std::lock_guard l{store_.lock()}; std::lock_guard l{store_.lock()};
auto qres{store_.run_query(q, sort_field->id, qflags, maxnum)}; auto qres{store_.run_query(q, sort_field_id, qflags, maxnum)};
if (!qres) if (!qres)
throw Error(Error::Code::Query, "failed to run query"); throw Error(Error::Code::Query, "failed to run query: %s", qres.error().what());
/* before sending new results, send an 'erase' message, so the frontend /* before sending new results, send an 'erase' message, so the frontend
* knows it should erase the headers buffer. this will ensure that the * knows it should erase the headers buffer. this will ensure that the