X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=notmuch-index-message.cc;h=a3483b93b6b35b01c1bb95caa8beba2b55d70526;hb=a5865d057498f929cf3af5768e3cdac745bb046d;hp=4585a3b98905d03d44252f7a88d55b2c06f76f23;hpb=bae1ce09a37071cdf592048938319c72653e96e0;p=notmuch

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 4585a3b9..a3483b93 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -54,6 +54,7 @@
 #include <string.h>
 #include <errno.h>
 #include <time.h>
+#include <sys/time.h>
 
 #include <iostream>
 
@@ -204,6 +205,9 @@ gen_terms_address_names (Xapian::TermGenerator term_gen,
     int i;
     InternetAddress *address;
 
+    if (addresses == NULL)
+	return;
+
     for (i = 0; i < internet_address_list_length (addresses); i++) {
 	address = internet_address_list_get_address (addresses, i);
 	gen_terms_address_name (term_gen, address, address_type);
@@ -234,6 +238,9 @@ add_terms_address_addrs (Xapian::Document doc,
     int i;
     InternetAddress *address;
 
+    if (addresses == NULL)
+	return;
+
     for (i = 0; i < internet_address_list_length (addresses); i++) {
 	address = internet_address_list_get_address (addresses, i);
 	add_term_address_addr (doc, address, address_type);
@@ -246,6 +253,9 @@ skip_re_in_subject (const char *subject)
 {
     const char *s = subject;
 
+    if (subject == NULL)
+	return NULL;
+
     while (*s) {
 	while (*s && isspace (*s))
 	    s++;
@@ -465,7 +475,17 @@ gen_terms_part (Xapian::TermGenerator term_gen,
 	return;
     }
 
-    if (! GMIME_IS_PART (part)) {
+    if (GMIME_IS_MESSAGE_PART (part)) {
+	GMimeMessage *message;
+
+	message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+
+	gen_terms_part (term_gen, g_mime_message_get_mime_part (message));
+
+	return;
+    }
+
+    if (! (GMIME_IS_PART (part))) {
 	fprintf (stderr, "Warning: Not indexing unknown mime part: %s.\n",
 		 g_type_name (G_OBJECT_TYPE (part)));
 	return;
@@ -497,7 +517,8 @@ gen_terms_part (Xapian::TermGenerator term_gen,
     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);
+    if (wrapper)
+	g_mime_data_wrapper_write_to_stream (wrapper, stream);
 
     g_object_unref (stream);
 
@@ -670,6 +691,8 @@ main (int argc, char **argv)
     GIOChannel *channel;
     GIOStatus gio_status;
     GError *error = NULL;
+    int count;
+    struct timeval tv_start, tv_now;
 
     if (argc < 2) {
 	usage (argv[0]);
@@ -691,6 +714,10 @@ main (int argc, char **argv)
 
 	channel = g_io_channel_unix_new (fileno (stdin));
 
+	count = 0;
+
+	gettimeofday (&tv_start, NULL);
+
 	while (1) {
 	    gio_status = g_io_channel_read_line (channel, &filename,
 						 NULL, NULL, &error);
@@ -706,6 +733,14 @@ main (int argc, char **argv)
 	    index_file (db, term_gen, filename);
 
 	    g_free (filename);
+
+	    count++;
+	    if (count % 250 == 0) {
+		gettimeofday (&tv_now, NULL);
+		printf ("Indexed %d messages (%g messages/second)\n",
+			count, count / ((tv_now.tv_sec - tv_start.tv_sec) +
+					(tv_now.tv_usec - tv_start.tv_usec) / 1e6));
+	    }
 	}
 
     } catch (const Xapian::Error &error) {