X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-index-message.cc;h=6795430b8c72aa8d8e8e34c6027c561851366a92;hp=0aa374c8133308e3a60de1ad59bf31131c63bf49;hb=653ff260f5124acfcb5d8f775038fd6cc3daa361;hpb=9ab2447e89906f826bb4efbd232c23db9b64b528 diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc index 0aa374c8..6795430b 100644 --- a/notmuch-index-message.cc +++ b/notmuch-index-message.cc @@ -139,11 +139,29 @@ gen_terms_address_name (Xapian::TermGenerator term_gen, const char *prefix_name) { const char *name; + int own_name = 0; name = internet_address_get_name (address); + /* In the absence of a name, we'll strip the part before the @ + * from the address. */ + if (! name) { + InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address); + const char *addr = internet_address_mailbox_get_addr (mailbox); + const char *at; + + at = strchr (addr, '@'); + if (at) { + name = strndup (addr, at - addr); + own_name = 1; + } + } + if (name) gen_terms (term_gen, prefix_name, name); + + if (own_name) + free ((void *) name); } static void @@ -251,26 +269,44 @@ static void insert_thread_id (GHashTable *thread_ids, Xapian::Document doc) { string value_string; - const char *value; + const char *value, *id, *comma; value_string = doc.get_value (NOTMUCH_VALUE_THREAD); value = value_string.c_str(); - if (strlen (value)) - g_hash_table_insert (thread_ids, strdup (value), NULL); + if (strlen (value)) { + id = value; + while (*id) { + comma = strchr (id, ','); + if (comma == NULL) + comma = id + strlen (id); + g_hash_table_insert (thread_ids, + strndup (id, comma - id), NULL); + id = comma; + if (*id) + id++; + } + } } -static char * -find_thread_id (Xapian::Database db, - GPtrArray *parents, - const char *message_id) +/* Return one or more thread_ids, (as a GPtrArray of strings), for the + * given message based on looking into the database for any messages + * referenced in parents, and also for any messages in the database + * referencing message_id. + * + * Caller should free all strings in the array and the array itself, + * (g_ptr_array_free) when done. */ +static GPtrArray * +find_thread_ids (Xapian::Database db, + GPtrArray *parents, + const char *message_id) { Xapian::PostingIterator child, children_end; Xapian::Document doc; GHashTable *thread_ids; GList *keys, *l; - GString *result = NULL; unsigned int i; const char *parent_message_id; + GPtrArray *result; thread_ids = g_hash_table_new (g_str_hash, g_str_equal); @@ -286,136 +322,146 @@ find_thread_id (Xapian::Database db, insert_thread_id (thread_ids, doc); } + result = g_ptr_array_new (); + keys = g_hash_table_get_keys (thread_ids); for (l = keys; l; l = l->next) { char *id = (char *) l->data; - if (result == NULL) { - result = g_string_new (id); - } else { - g_string_append_printf (result, ",%s", id); - } - free (id); + g_ptr_array_add (result, id); } - if (result) - return g_string_free (result, FALSE); - else - return NULL; + return result; } /* Add a term for each message-id in the References header of the * message. */ static void parse_references (GPtrArray *array, - const char *refs) + const char *refs_str) { - const char *end, *next; + GMimeReferences *refs, *r; + const char *message_id; - if (refs == NULL) + if (refs_str == NULL) return; - while (*refs) { - while (*refs && isspace (*refs)) - refs++; - if (*refs == '<') - refs++; - end = refs; - while (*end && !isspace (*end)) - end++; - next = end; - end--; - if (end > refs && *end == '>') - end--; - if (end > refs) { - g_ptr_array_add (array, g_strndup (refs, end - refs + 1)); - } - refs = next; + refs = g_mime_references_decode (refs_str); + + for (r = refs; r; r = r->next) { + message_id = g_mime_references_get_message_id (r); + g_ptr_array_add (array, g_strdup (message_id)); } + + g_mime_references_free (refs); } -/* Generate terms for the body of a message, given the filename of the - * message and the offset at which the headers of the message end, - * (and hence the body begins). */ +/* Given a string representing the body of a message, generate terms + * for it, (skipping quoted portions and signatures). */ static void -gen_terms_body (Xapian::TermGenerator term_gen, - const char * filename, - gint64 body_offset) +gen_terms_body_str (Xapian::TermGenerator term_gen, + char *body) { - GIOChannel *channel; - GIOStatus gio_status; - GError *error = NULL; - char *p, *body_line = NULL, *prev_line = NULL; + char *line, *line_end, *next_line; - channel = g_io_channel_new_file (filename, "r", &error); - if (channel == NULL) { - fprintf (stderr, "Error: %s\n", error->message); - exit (1); - } + if (body == NULL) + return; - gio_status = g_io_channel_seek_position (channel, body_offset, - G_SEEK_SET, &error); - if (gio_status != G_IO_STATUS_NORMAL) { - fprintf (stderr, "Error: %s\n", error->message); - exit (1); - } + next_line = body; while (1) { - if (body_line) - g_free (body_line); - - gio_status = g_io_channel_read_line (channel, &body_line, - NULL, NULL, &error); - if (gio_status == G_IO_STATUS_EOF) + line = next_line; + if (*line == '\0') break; - if (gio_status != G_IO_STATUS_NORMAL) { - fprintf (stderr, "Error: %s\n", error->message); - exit (1); + + next_line = strchr (line, '\n'); + if (next_line == NULL) { + next_line = line + strlen (line); } + line_end = next_line - 1; - if (strlen (body_line) == 0) - continue; + /* Trim whitespace. */ + while (*next_line && isspace (*next_line)) + next_line++; - /* If the line looks like it might be introducing a quote, - * save it until we see if the next line begins a quote. */ - p = body_line + strlen (body_line) - 1; - while (p > body_line and isspace (*p)) - p--; - if (*p == ':') { - prev_line = body_line; - body_line = NULL; + /* Skip lines that are quotes. */ + if (*line == '>') continue; - } - /* Skip quoted lines, (and previous lines that introduced them) */ - if (body_line[0] == '>') { - if (prev_line) { - g_free (prev_line); - prev_line = NULL; - } + /* Also skip lines introducing a quote on the next line. */ + if (*line_end == ':' && *next_line == '>') continue; - } - - /* Now that we're not looking at a quote we can add the prev_line */ - if (prev_line) { - gen_terms (term_gen, "body", prev_line); - g_free (prev_line); - prev_line = NULL; - } - /* Skip signatures */ + /* Finally, bail as soon as we see a signature. */ /* XXX: Should only do this if "near" the end of the message. */ - if (strncmp (body_line, "-- ", 3) == 0 || - strncmp (body_line, "----------", 10) == 0 || - strncmp (body_line, "__________", 10) == 0) + if (strncmp (line, "-- ", 3) == 0 || + strncmp (line, "----------", 10) == 0 || + strncmp (line, "__________", 10) == 0) break; - gen_terms (term_gen, "body", body_line); + *(line_end + 1) = '\0'; + gen_terms (term_gen, "body", line); } +} + + +/* Callback to generate terms for each mime part of a message. */ +static void +gen_terms_part (Xapian::TermGenerator term_gen, + GMimeObject *part) +{ + GMimeStream *stream; + GMimeDataWrapper *wrapper; + GByteArray *byte_array; + GMimeContentDisposition *disposition; + char *body; + + if (GMIME_IS_MULTIPART (part)) { + GMimeMultipart *multipart = GMIME_MULTIPART (part); + int i; + + for (i = 0; i < g_mime_multipart_get_count (multipart); i++) { + if (GMIME_IS_MULTIPART_SIGNED (multipart)) { + /* Don't index the signature. */ + if (i == 1) + continue; + if (i > 1) + fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Indexing anyway.\n"); + } + gen_terms_part (term_gen, + g_mime_multipart_get_part (multipart, i)); + } + return; + } + + if (! GMIME_IS_PART (part)) { + fprintf (stderr, "Warning: Not indexing unknown mime part: %s.\n", + g_type_name (G_OBJECT_TYPE (part))); + return; + } + + disposition = g_mime_object_get_content_disposition (GMIME_OBJECT (part)); + if (disposition && + strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) + { + add_term (term_gen.get_document (), "label", "attachment"); + return; + } + + byte_array = g_byte_array_new (); + + stream = g_mime_stream_mem_new_with_byte_array (byte_array); + g_mime_stream_mem_set_owner (GMIME_STREAM_MEM (stream), FALSE); + wrapper = g_mime_part_get_content_object (GMIME_PART (part)); + g_mime_data_wrapper_write_to_stream (wrapper, stream); + + g_object_unref (stream); + + g_byte_array_append (byte_array, (guint8 *) "\0", 1); + body = (char *) g_byte_array_free (byte_array, FALSE); - if (body_line) - g_free (body_line); + gen_terms_body_str (term_gen, body); - g_io_channel_close (channel); + free (body); } static void @@ -429,12 +475,12 @@ index_file (Xapian::WritableDatabase db, GMimeParser *parser; GMimeMessage *message; InternetAddressList *addresses; - GPtrArray *parents; + GPtrArray *parents, *thread_ids; FILE *file; const char *subject, *refs, *in_reply_to, *from; - const char *message_id, *thread_id; + const char *message_id; time_t time; struct tm gm_time_tm; @@ -474,8 +520,7 @@ index_file (Xapian::WritableDatabase db, gen_terms (term_gen, "subject", subject); gen_terms (term_gen, "body", subject); - gen_terms_body (term_gen, filename, - g_mime_parser_get_headers_end (parser)); + gen_terms_part (term_gen, g_mime_message_get_mime_part (message)); parents = g_ptr_array_new (); @@ -491,7 +536,7 @@ index_file (Xapian::WritableDatabase db, message_id = g_mime_message_get_message_id (message); - thread_id = find_thread_id (db, parents, message_id); + thread_ids = find_thread_ids (db, parents, message_id); for (i = 0; i < parents->len; i++) g_free (g_ptr_array_index (parents, i)); @@ -526,10 +571,28 @@ index_file (Xapian::WritableDatabase db, add_term (doc, "msgid", message_id); doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id); - if (thread_id) { - add_term (doc, "thread", thread_id); - doc.add_value (NOTMUCH_VALUE_THREAD, thread_id); - free ((void *) thread_id); + if (thread_ids->len) { + unsigned int i; + GString *thread_id; + char *id; + + for (i = 0; i < thread_ids->len; i++) { + id = (char *) thread_ids->pdata[i]; + + add_term (doc, "thread", id); + + if (i == 0) + thread_id = g_string_new (id); + else + g_string_append_printf (thread_id, ",%s", id); + + free (id); + } + g_ptr_array_free (thread_ids, TRUE); + + doc.add_value (NOTMUCH_VALUE_THREAD, thread_id->str); + + g_string_free (thread_id, TRUE); } else { /* If not referenced thread, use the message ID */ add_term (doc, "thread", message_id);