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

message: update implementation

Browse Source 
Add more of the Message class (and various helpers), which are to replace all
the `mu-msg-*` code.

Add more tests.
This commit is contained in:
Dirk-Jan C. Binnema
2022-03-26 16:19:08 +02:00
parent 55402622b9
commit 37988b5a26
12 changed files with 2056 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/message/mu-fields.hh
View File

@ -24,9 +24,9 @@
#include <string_view>
#include <algorithm>
#include <array>
#include <optional>
#include <xapian.h>
#include <utils/mu-utils.hh>
#include <utils/mu-option.hh>
namespace Mu {
@ -320,7 +320,7 @@ static constexpr std::array<Field, Field::id_size()>
Field::Type::String,
"msgid",
"Attachment MIME-type",
"mime:image/jpeg",
"msgid:abc@123",
'i',
Field::Flag::GMime |
Field::Flag::NormalTerm |
@ -502,11 +502,11 @@ void field_for_each(Func&& func) {
* @return a message-field id, or nullopt if not found.
*/
template <typename Pred>
std::optional<Field> field_find_if(Pred&& pred) {
Option<Field> field_find_if(Pred&& pred) {
for (auto&& field: Fields)
if (pred(field))
return field;
return std::nullopt;
return Nothing;
}
/**
@ -517,13 +517,13 @@ std::optional<Field> field_find_if(Pred&& pred) {
* @return the message-field-id or nullopt.
*/
static inline
std::optional<Field> field_from_shortcut(char shortcut) {
Option<Field> field_from_shortcut(char shortcut) {
return field_find_if([&](auto&& field){
return field.shortcut == shortcut;
});
}
static inline
std::optional<Field> field_from_name(const std::string& name) {
Option<Field> field_from_name(const std::string& name) {
if (name.length() == 1)
return field_from_shortcut(name[0]);
else
@ -540,10 +540,10 @@ std::optional<Field> field_from_name(const std::string& name) {
* @return Field::Id or nullopt
*/
static inline
std::optional<Field> field_from_number(size_t id)
Option<Field> field_from_number(size_t id)
{
if (id >= static_cast<size_t>(Field::Id::_count_))
return std::nullopt;
return Nothing;
else
return field_from_id(static_cast<Field::Id>(id));
}