X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-index-message.cc;h=1ed3b4c92d182e4ad9eed30752d2148cb5117a5c;hp=6f0b21e73b7dd2175a0ace0e6ae220745bdcaccc;hb=7d1227c4a8699522e5b396b5d33e1f8a7ceebe21;hpb=dceb501e44b5279df6df76b19688c156256b75c2 diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc index 6f0b21e7..1ed3b4c9 100644 --- a/notmuch-index-message.cc +++ b/notmuch-index-message.cc @@ -33,6 +33,9 @@ using namespace std; #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) +/* Xapian complains if we provide a term longer than this. */ +#define NOTMUCH_MAX_TERM 245 + /* These prefix values are specifically chosen to be compatible * with sup, (http://sup.rubyforge.org), written by * William Morgan , and released @@ -109,7 +112,8 @@ add_term (Xapian::Document doc, term = g_strdup_printf ("%s%s", prefix, value); - doc.add_term (term); + if (strlen (term) <= NOTMUCH_MAX_TERM) + doc.add_term (term); g_free (term); } @@ -204,6 +208,88 @@ skip_re_in_subject (const char *subject) return s; } +Xapian::Document +find_message (Xapian::Database db, const char *message_id) +{ + Xapian::PostingIterator i; + char *term; + + term = g_strdup_printf ("%s%s", find_prefix ("msgid"), message_id); + i = db.postlist_begin (term); + if (i != db.postlist_end (term)) + return db.get_document (*i); + else + return Xapian::Document (); +} + +static char * +find_thread_id (Xapian::Database db, GPtrArray *parents) +{ + Xapian::Document doc; + GHashTable *thread_ids; + GList *keys, *l; + GString *result = NULL; + unsigned int i; + string value_string; + const char *value; + + thread_ids = g_hash_table_new (g_str_hash, g_str_equal); + + for (i = 0; i < parents->len; i++) { + doc = find_message (db, (char *) g_ptr_array_index (parents, i)); + 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); + } + + 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); + } + + if (result) + return g_string_free (result, FALSE); + else + return NULL; +} + +/* 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 *end, *next; + + if (refs == 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; + } +} + /* 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). */ @@ -275,7 +361,9 @@ gen_terms_body (Xapian::TermGenerator term_gen, /* Skip signatures */ /* XXX: Should only do this if "near" the end of the message. */ - if (strncmp (body_line, "-- ", 3) == 0) + if (strncmp (body_line, "-- ", 3) == 0 || + strncmp (body_line, "----------", 10) == 0 || + strncmp (body_line, "__________", 10) == 0) break; gen_terms (term_gen, "body", body_line); @@ -287,32 +375,27 @@ gen_terms_body (Xapian::TermGenerator term_gen, g_io_channel_close (channel); } - -int -main (int argc, char **argv) +static void +index_file (Xapian::WritableDatabase db, + Xapian::TermGenerator term_gen, + const char *filename) { + Xapian::Document doc; + GMimeStream *stream; GMimeParser *parser; GMimeMessage *message; InternetAddressList *addresses; + GPtrArray *parents; - const char *database_path, *filename; FILE *file; - const char *value, *from; + const char *value, *from, *thread_id; time_t time; struct tm gm_time_tm; char date_str[16]; /* YYYYMMDDHHMMSS + 1 for Y100k compatibility ;-) */ - - if (argc < 3) { - fprintf (stderr, "Usage: %s \n", - argv[0]); - exit (1); - } - - database_path = argv[1]; - filename = argv[2]; + unsigned int i; file = fopen (filename, "r"); if (! file) { @@ -320,92 +403,161 @@ main (int argc, char **argv) exit (1); } - g_mime_init (0); - stream = g_mime_stream_file_new (file); parser = g_mime_parser_new_with_stream (stream); message = g_mime_parser_construct_message (parser); - try { - Xapian::WritableDatabase db; - Xapian::TermGenerator term_gen; - Xapian::Document doc; + doc = Xapian::Document (); - doc = Xapian::Document (); + doc.set_data (filename); - doc.set_data (filename); + term_gen.set_stemmer (Xapian::Stem ("english")); - db = Xapian::WritableDatabase (database_path, - Xapian::DB_CREATE_OR_OPEN); + term_gen.set_document (doc); - term_gen = Xapian::TermGenerator (); - term_gen.set_stemmer (Xapian::Stem ("english")); + from = g_mime_message_get_sender (message); + addresses = internet_address_list_parse_string (from); - term_gen.set_document (doc); + gen_terms_address_names (term_gen, addresses, "from_name"); - from = g_mime_message_get_sender (message); - addresses = internet_address_list_parse_string (from); + addresses = g_mime_message_get_all_recipients (message); + gen_terms_address_names (term_gen, addresses, "to_name"); - gen_terms_address_names (term_gen, addresses, "from_name"); + value = g_mime_message_get_subject (message); + value = skip_re_in_subject (value); + gen_terms (term_gen, "subject", value); + gen_terms (term_gen, "body", value); - addresses = g_mime_message_get_all_recipients (message); - gen_terms_address_names (term_gen, addresses, "to_name"); + gen_terms_body (term_gen, filename, + g_mime_parser_get_headers_end (parser)); - value = g_mime_message_get_subject (message); - value = skip_re_in_subject (value); - gen_terms (term_gen, "subject", value); - gen_terms (term_gen, "body", value); + parents = g_ptr_array_new (); - gen_terms_body (term_gen, filename, - g_mime_parser_get_headers_end (parser)); + value = g_mime_object_get_header (GMIME_OBJECT (message), "references"); + parse_references (parents, value); - from = g_mime_message_get_sender (message); - addresses = internet_address_list_parse_string (from); + value = g_mime_object_get_header (GMIME_OBJECT (message), "in-reply-to"); + parse_references (parents, value); - add_terms_address_addrs (doc, addresses, "from_email"); + for (i = 0; i < parents->len; i++) + add_term (doc, "ref", (char *) g_ptr_array_index (parents, i)); - add_terms_address_addrs (doc, - g_mime_message_get_all_recipients (message), - "to_email"); + thread_id = find_thread_id (db, parents); - g_mime_message_get_date (message, &time, NULL); + for (i = 0; i < parents->len; i++) + g_free (g_ptr_array_index (parents, i)); + g_ptr_array_free (parents, TRUE); - gmtime_r (&time, &gm_time_tm); + from = g_mime_message_get_sender (message); + addresses = internet_address_list_parse_string (from); - if (strftime (date_str, sizeof (date_str), - "%Y%m%d%H%M%S", &gm_time_tm) == 0) { - fprintf (stderr, "Internal error formatting time\n"); - exit (1); - } + add_terms_address_addrs (doc, addresses, "from_email"); - add_term (doc, "date", date_str); + add_terms_address_addrs (doc, + g_mime_message_get_all_recipients (message), + "to_email"); - add_term (doc, "label", "inbox"); - add_term (doc, "label", "unread"); - add_term (doc, "type", "mail"); - add_term (doc, "source_id", "1"); + g_mime_message_get_date (message, &time, NULL); - value = g_mime_message_get_message_id (message); - add_term (doc, "msgid", value); - add_term (doc, "thread", value); + gmtime_r (&time, &gm_time_tm); - doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, value); - doc.add_value (NOTMUCH_VALUE_THREAD, value); + if (strftime (date_str, sizeof (date_str), + "%Y%m%d%H%M%S", &gm_time_tm) == 0) { + fprintf (stderr, "Internal error formatting time\n"); + exit (1); + } - doc.add_value (NOTMUCH_VALUE_DATE, Xapian::sortable_serialise (time)); + add_term (doc, "date", date_str); - db.add_document (doc); + add_term (doc, "label", "inbox"); + add_term (doc, "label", "unread"); + add_term (doc, "type", "mail"); + add_term (doc, "source_id", "1"); - } catch (const Xapian::Error &error) { - cerr << "A Xapian exception occurred: " << error.get_msg () << endl; - exit (1); + value = g_mime_message_get_message_id (message); + add_term (doc, "msgid", value); + doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, value); + + if (thread_id) { + add_term (doc, "thread", thread_id); + doc.add_value (NOTMUCH_VALUE_THREAD, thread_id); + free ((void *) thread_id); + } else { + /* If not referenced thread, use the message ID */ + add_term (doc, "thread", value); + doc.add_value (NOTMUCH_VALUE_THREAD, value); } + doc.add_value (NOTMUCH_VALUE_DATE, Xapian::sortable_serialise (time)); + + db.add_document (doc); + g_object_unref (message); g_object_unref (parser); g_object_unref (stream); +} + +static void +usage (const char *argv0) +{ + fprintf (stderr, "Usage: %s \n", argv0); + fprintf (stderr, "\n"); + fprintf (stderr, "Messages to be indexed are read from stdnin as absolute filenames\n"); + fprintf (stderr, "one file per line."); +} + +int +main (int argc, char **argv) +{ + const char *database_path; + char *filename; + GIOChannel *channel; + GIOStatus gio_status; + GError *error = NULL; + + if (argc < 2) { + usage (argv[0]); + exit (1); + } + + database_path = argv[1]; + + g_mime_init (0); + + try { + Xapian::WritableDatabase db; + Xapian::TermGenerator term_gen; + + db = Xapian::WritableDatabase (database_path, + Xapian::DB_CREATE_OR_OPEN); + + term_gen = Xapian::TermGenerator (); + + channel = g_io_channel_unix_new (fileno (stdin)); + + while (1) { + gio_status = g_io_channel_read_line (channel, &filename, + NULL, NULL, &error); + if (gio_status == G_IO_STATUS_EOF) + break; + if (gio_status != G_IO_STATUS_NORMAL) { + fprintf (stderr, "An error occurred reading from stdin: %s\n", + error->message); + exit (1); + } + + g_strchomp (filename); + index_file (db, term_gen, filename); + + g_free (filename); + } + + } catch (const Xapian::Error &error) { + cerr << "A Xapian exception occurred: " << error.get_msg () << endl; + exit (1); + } return 0; }