debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-24 08:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/n_d_add_message: refactor test for new/ghost messages

Browse source 
The switch is easier to understand than the side effects in the if
test. It also potentially allows us more flexibility in breaking up
this function into smaller pieces, since passing private_status around
is icky.
This commit is contained in:
David Bremner 2017-06-04 09:32:25 -03:00
parent 4034a7cec7
commit 95b52e85b2
1 changed files with 13 additions and 10 deletions

23
lib/add-message.cc
View file

@ -570,7 +570,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
notmuch_message_t *message = NULL;
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS, ret2;
notmuch_private_status_t private_status;
notmuch_bool_t is_ghost = false;
notmuch_bool_t is_ghost = FALSE, is_new = FALSE;
const char *date, *header;
const char *from, *to, *subject;
@ -655,7 +655,17 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
talloc_free (message_id);
if (message == NULL) {
/* We cannot call notmuch_message_get_flag for a new message */
switch (private_status) {
case NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND:
is_ghost = FALSE;
is_new = TRUE;
break;
case NOTMUCH_PRIVATE_STATUS_SUCCESS:
is_ghost = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_GHOST);
is_new = FALSE;
break;
default:
ret = COERCE_STATUS (private_status,
"Unexpected status value from _notmuch_message_create_for_message_id");
goto DONE;
@ -663,18 +673,11 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
_notmuch_message_add_filename (message, filename);
/* Is this a newly created message object or a ghost
* message? We have to be slightly careful: if this is a
* blank message, it's not safe to call
* notmuch_message_get_flag yet. */
if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND ||
(is_ghost = notmuch_message_get_flag (
message, NOTMUCH_MESSAGE_FLAG_GHOST))) {
if (is_new || is_ghost) {
_notmuch_message_add_term (message, "type", "mail");
if (is_ghost)
/* Convert ghost message to a regular message */
_notmuch_message_remove_term (message, "type", "ghost");
ret = _notmuch_database_link_message (notmuch, message,
message_file, is_ghost);
if (ret)