From 4fdabd636e1b0417bb40c71bdce64e18f0f347e2 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 4 Jun 2017 09:32:27 -0300 Subject: [PATCH] lib: refactor notmuch_database_add_message header parsing This function is large and hard to understand and modify. Start to break it down into meaningful pieces. --- lib/add-message.cc | 54 ++------------------------- lib/message-file.c | 86 +++++++++++++++++++++++++++++++++++++++++++ lib/notmuch-private.h | 11 ++++++ 3 files changed, 101 insertions(+), 50 deletions(-) diff --git a/lib/add-message.cc b/lib/add-message.cc index 314016a8..2922eaa9 100644 --- a/lib/add-message.cc +++ b/lib/add-message.cc @@ -468,7 +468,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch, notmuch_private_status_t private_status; notmuch_bool_t is_ghost = FALSE, is_new = FALSE; - const char *date, *header; + const char *date; const char *from, *to, *subject; char *message_id = NULL; @@ -489,57 +489,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 @@ -579,7 +534,6 @@ notmuch_database_add_message (notmuch_database_t *notmuch, if (ret) goto DONE; - date = _notmuch_message_file_get_header (message_file, "date"); _notmuch_message_set_header_values (message, date, from, subject); ret = _notmuch_message_index_file (message, message_file); diff --git a/lib/message-file.c b/lib/message-file.c index d7acf0d5..b90df305 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -92,6 +92,12 @@ _notmuch_message_file_open (notmuch_database_t *notmuch, return _notmuch_message_file_open_ctx (notmuch, NULL, filename); } +const char * +_notmuch_message_file_get_filename (notmuch_message_file_t *message_file) +{ + return message_file->filename; +} + void _notmuch_message_file_close (notmuch_message_file_t *message) { @@ -345,3 +351,83 @@ _notmuch_message_file_get_header (notmuch_message_file_t *message, return decoded; } + +notmuch_status_t +_notmuch_message_file_get_headers (notmuch_message_file_t *message_file, + const char **from_out, + const char **subject_out, + const char **to_out, + const char **date_out, + char **message_id_out) +{ + notmuch_status_t ret; + const char *header; + const char *from, *to, *subject, *date; + char *message_id = NULL; + + /* Parse message up front to get better error status. */ + ret = _notmuch_message_file_parse (message_file); + 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"); + date = _notmuch_message_file_get_header (message_file, "date"); + + 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 = _notmuch_message_id_parse (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 (_notmuch_message_file_get_filename (message_file)); + + /* 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); + } + DONE: + if (ret == NOTMUCH_STATUS_SUCCESS) { + if (from_out) + *from_out = from; + if (subject_out) + *subject_out = subject; + if (to_out) + *to_out = to; + if (date_out) + *date_out = date; + if (message_id_out) + *message_id_out = message_id; + } + return ret; +} diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 9957164d..57c61639 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -425,6 +425,17 @@ const char * _notmuch_message_file_get_header (notmuch_message_file_t *message, const char *header); +notmuch_status_t +_notmuch_message_file_get_headers (notmuch_message_file_t *message_file, + const char **from_out, + const char **subject_out, + const char **to_out, + const char **date_out, + char **message_id_out); + +const char * +_notmuch_message_file_get_filename (notmuch_message_file_t *message); + /* index.cc */ notmuch_status_t