X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fadd-message.cc;h=f5fac8be751fa2706d09383c07390652e73dc679;hp=314016a8c49f70638de0fd05ee5ef8a50f12f5c0;hb=4dfcc8c9b2e1dbb965f69283dca50c7581c88050;hpb=2f94b3090c03bb56b43c4adfb94f7eeb28a6bf18 diff --git a/lib/add-message.cc b/lib/add-message.cc index 314016a8..f5fac8be 100644 --- a/lib/add-message.cc +++ b/lib/add-message.cc @@ -220,7 +220,7 @@ _my_talloc_free_for_g_hash (void *ptr) talloc_free (ptr); } -static notmuch_status_t +notmuch_status_t _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch, notmuch_message_t *message, notmuch_message_file_t *message_file, @@ -404,7 +404,7 @@ static notmuch_status_t _notmuch_database_link_message (notmuch_database_t *notmuch, notmuch_message_t *message, notmuch_message_file_t *message_file, - notmuch_bool_t is_ghost) + bool is_ghost) { void *local = talloc_new (NULL); notmuch_status_t status; @@ -458,17 +458,19 @@ _notmuch_database_link_message (notmuch_database_t *notmuch, } notmuch_status_t -notmuch_database_add_message (notmuch_database_t *notmuch, - const char *filename, - notmuch_message_t **message_ret) +notmuch_database_index_file (notmuch_database_t *notmuch, + const char *filename, + notmuch_indexopts_t *indexopts, + notmuch_message_t **message_ret) { notmuch_message_file_t *message_file; 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, is_new = FALSE; + bool is_ghost = false, is_new = false; + notmuch_indexopts_t *def_indexopts = NULL; - const char *date, *header; + const char *date; const char *from, *to, *subject; char *message_id = NULL; @@ -489,57 +491,12 @@ notmuch_database_add_message (notmuch_database_t *notmuch, if (ret) goto DONE; - /* Parse message up front to get better error status. */ - ret = _notmuch_message_file_parse (message_file); + ret = _notmuch_message_file_get_headers (message_file, + &from, &subject, &to, &date, + &message_id); if (ret) goto DONE; - /* Before we do any real work, (especially before doing a - * potential SHA-1 computation on the entire file's contents), - * let's make sure that what we're looking at looks like an - * actual email message. - */ - from = _notmuch_message_file_get_header (message_file, "from"); - subject = _notmuch_message_file_get_header (message_file, "subject"); - to = _notmuch_message_file_get_header (message_file, "to"); - - if ((from == NULL || *from == '\0') && - (subject == NULL || *subject == '\0') && - (to == NULL || *to == '\0')) { - ret = NOTMUCH_STATUS_FILE_NOT_EMAIL; - goto DONE; - } - - /* Now that we're sure it's mail, the first order of business - * is to find a message ID (or else create one ourselves). - */ - header = _notmuch_message_file_get_header (message_file, "message-id"); - if (header && *header != '\0') { - message_id = _parse_message_id (message_file, header, NULL); - - /* So the header value isn't RFC-compliant, but it's - * better than no message-id at all. - */ - if (message_id == NULL) - message_id = talloc_strdup (message_file, header); - } - - if (message_id == NULL ) { - /* No message-id at all, let's generate one by taking a - * hash over the file's contents. - */ - char *sha1 = _notmuch_sha1_of_file (filename); - - /* If that failed too, something is really wrong. Give up. */ - if (sha1 == NULL) { - ret = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } - - message_id = talloc_asprintf (message_file, "notmuch-sha1-%s", sha1); - free (sha1); - } - try { /* Now that we have a message ID, we get a message object, * (which may or may not reference an existing document in the @@ -554,12 +511,12 @@ notmuch_database_add_message (notmuch_database_t *notmuch, /* 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; + 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; + is_new = false; break; default: ret = COERCE_STATUS (private_status, @@ -574,31 +531,41 @@ notmuch_database_add_message (notmuch_database_t *notmuch, if (is_ghost) /* Convert ghost message to a regular message */ _notmuch_message_remove_term (message, "type", "ghost"); - ret = _notmuch_database_link_message (notmuch, message, + } + + ret = _notmuch_database_link_message (notmuch, message, message_file, is_ghost); - if (ret) - goto DONE; + if (ret) + goto DONE; - date = _notmuch_message_file_get_header (message_file, "date"); + if (is_new || is_ghost) _notmuch_message_set_header_values (message, date, from, subject); - ret = _notmuch_message_index_file (message, message_file); - if (ret) - goto DONE; - } else { - ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; + if (!indexopts) { + def_indexopts = notmuch_database_get_default_indexopts (notmuch); + indexopts = def_indexopts; } + ret = _notmuch_message_index_file (message, indexopts, message_file); + if (ret) + goto DONE; + + if (! is_new && !is_ghost) + ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; + _notmuch_message_sync (message); } catch (const Xapian::Error &error) { _notmuch_database_log (notmuch, "A Xapian exception occurred adding message: %s.\n", error.get_msg().c_str()); - notmuch->exception_reported = TRUE; + notmuch->exception_reported = true; ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION; goto DONE; } DONE: + if (def_indexopts) + notmuch_indexopts_destroy (def_indexopts); + if (message) { if ((ret == NOTMUCH_STATUS_SUCCESS || ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) && message_ret) @@ -618,3 +585,14 @@ notmuch_database_add_message (notmuch_database_t *notmuch, return ret; } + +notmuch_status_t +notmuch_database_add_message (notmuch_database_t *notmuch, + const char *filename, + notmuch_message_t **message_ret) +{ + return notmuch_database_index_file (notmuch, filename, + NULL, + message_ret); + +}