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

lib/message-flags: update whitespace & clang++ appeasement

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2022-02-18 07:10:31 +02:00
parent 0f87cedb77
commit fe2b1693c1
1 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/mu-message-flags.hh
View File

@ -23,6 +23,7 @@
#include <algorithm>
#include <optional>
#include <string_view>
#include <array>
#include "utils/mu-utils.hh"
namespace Mu {
@ -55,10 +56,9 @@ enum struct MessageFlags {
Encrypted = 1 << 8, /**< Encrypted */
HasAttachment = 1 << 9, /**< Has an attachment */
Unread = 1 << 10, /**< Unread; pseudo-flag, only for queries, so
* we can search for flag:unread, which is
* equivalent to 'flag:new OR NOT
* flag:seen' */
Unread = 1 << 10, /**< Unread; pseudo-flag, only for queries, so we can
* search for flag:unread, which is equivalent to
* 'flag:new OR NOT flag:seen' */
/**
* other content flags
*/
@ -83,7 +83,6 @@ enum struct MessageFlagCategory {
Pseudo /**< Pseuodo flag */
};
/**
* Info about invidual message flags
*
@ -98,24 +97,25 @@ struct MessageFlagInfo {
/**
* Array of all flag information.
*/
constexpr std::array<MessageFlagInfo, 12>
AllMessageFlagInfos = {{
{MessageFlags::Draft, 'D', "draft", MessageFlagCategory::Mailfile},
{MessageFlags::Flagged, 'F', "flagged", MessageFlagCategory::Mailfile},
{MessageFlags::Passed, 'P', "passed", MessageFlagCategory::Mailfile},
{MessageFlags::Replied, 'R', "replied", MessageFlagCategory::Mailfile},
{MessageFlags::Seen, 'S', "seen", MessageFlagCategory::Mailfile},
{MessageFlags::Trashed, 'T', "trashed", MessageFlagCategory::Mailfile},
constexpr std::array<MessageFlagInfo, 12> AllMessageFlagInfos = {{
MessageFlagInfo{MessageFlags::Draft, 'D', "draft", MessageFlagCategory::Mailfile},
MessageFlagInfo{MessageFlags::Flagged, 'F', "flagged", MessageFlagCategory::Mailfile},
MessageFlagInfo{MessageFlags::Passed, 'P', "passed", MessageFlagCategory::Mailfile},
MessageFlagInfo{MessageFlags::Replied, 'R', "replied", MessageFlagCategory::Mailfile},
MessageFlagInfo{MessageFlags::Seen, 'S', "seen", MessageFlagCategory::Mailfile},
MessageFlagInfo{MessageFlags::Trashed, 'T', "trashed", MessageFlagCategory::Mailfile},
{MessageFlags::New, 'N', "new", MessageFlagCategory::Maildir},
MessageFlagInfo{MessageFlags::New, 'N', "new", MessageFlagCategory::Maildir},
{MessageFlags::Signed, 'z', "signed", MessageFlagCategory::Content},
{MessageFlags::Encrypted, 'x', "encrypted", MessageFlagCategory::Content},
{MessageFlags::HasAttachment, 'a', "attach", MessageFlagCategory::Content},
MessageFlagInfo{MessageFlags::Signed, 'z', "signed", MessageFlagCategory::Content},
MessageFlagInfo{MessageFlags::Encrypted, 'x', "encrypted",
MessageFlagCategory::Content},
MessageFlagInfo{MessageFlags::HasAttachment, 'a', "attach",
MessageFlagCategory::Content},
{MessageFlags::Unread, 'u', "unread", MessageFlagCategory::Pseudo},
MessageFlagInfo{MessageFlags::Unread, 'u', "unread", MessageFlagCategory::Pseudo},
{MessageFlags::MailingList, 'l', "list", MessageFlagCategory::Content},
MessageFlagInfo{MessageFlags::MailingList, 'l', "list", MessageFlagCategory::Content},
}};
/**
@ -137,7 +137,6 @@ message_flag_info(MessageFlags flag)
return AllMessageFlagInfos[static_cast<unsigned>(__builtin_ctz(val))];
}
/**
* Get flag info for some flag
*
@ -172,7 +171,6 @@ message_flag_info(std::string_view name)
return std::nullopt;
}
/**
* There are two string-based expression types for flags:
* 1) 'absolute': replace the existing flags
@ -189,8 +187,7 @@ message_flag_info(std::string_view name)
* @return the (OR'ed) flags or MessageFlags::None
*/
constexpr std::optional<MessageFlags>
message_flags_from_absolute_expr(std::string_view expr,
bool ignore_invalid=false)
message_flags_from_absolute_expr(std::string_view expr, bool ignore_invalid = false)
{
MessageFlags flags{MessageFlags::None};
@ -230,18 +227,13 @@ message_flags_from_delta_expr(std::string_view expr, MessageFlags flags,
return std::nullopt;
for (auto u = 0U; u != expr.size(); u += 2) {
if (const auto& info{message_flag_info(expr[u + 1])}; !info) {
if (!ignore_invalid)
return std::nullopt;
} else {
switch (expr[u]) {
case '+':
flags |= info->flag;
break;
case '-':
flags &= ~info->flag;
break;
case '+': flags |= info->flag; break;
case '-': flags &= ~info->flag; break;
default:
if (!ignore_invalid)
return std::nullopt;
@ -253,8 +245,6 @@ message_flags_from_delta_expr(std::string_view expr, MessageFlags flags,
return flags;
}
/**
* Calculate the flags from either 'absolute' or 'delta' expressions
*
@ -303,6 +293,6 @@ message_flags_filter(MessageFlags flags, MessageFlagCategory cat)
*/
std::string message_flags_to_string(MessageFlags flags);
} // namepace Mu
} // namespace Mu
#endif /* MU_MESSAGE_FLAGS_HH__ */