X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-index-message.cc;h=7610aa41f97c455ef0cf650ad3a52ac03886f2d8;hp=5c73825ba2f48e3d7964994d497e104c1a6464a0;hb=5fbdbeb333b4fb8293092e8cb9f5b19da3e53ed5;hpb=914df660c423c078df20390a4b647edbe8fb712a

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 5c73825b..7610aa41 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -171,30 +171,44 @@ gen_terms_address_name (Xapian::TermGenerator term_gen,
 			InternetAddress *address,
 			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;
+    if (INTERNET_ADDRESS_IS_MAILBOX(address)) {
+	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;
+	    }
+	}
 
-	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);
+    } else if (INTERNET_ADDRESS_IS_GROUP (address)) {
+	InternetAddressGroup *group = INTERNET_ADDRESS_GROUP (address);
+	InternetAddressList *list = internet_address_group_get_members(group);
+	if (list) {
+	    int	length = internet_address_list_length(list);
+	    int i;
+
+	    for (i = 0; i < length; i++)
+		gen_terms_address_name(term_gen,
+				       internet_address_list_get_address(list, i),
+				       prefix_name);
 	}
     }
-
-    if (name)
-	gen_terms (term_gen, prefix_name, name);
-
-    if (own_name)
-	free ((void *) name);
 }
 
 static void
@@ -221,13 +235,27 @@ add_term_address_addr (Xapian::Document doc,
 		       InternetAddress *address,
 		       const char *prefix_name)
 {
-    InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
-    const char *addr;
-
-    addr = internet_address_mailbox_get_addr (mailbox);
-
-    if (addr)
-	add_term (doc, prefix_name, addr);
+    if (INTERNET_ADDRESS_IS_MAILBOX(address)) {
+	InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
+	const char *addr;
+
+	addr = internet_address_mailbox_get_addr (mailbox);
+
+	if (addr)
+	    add_term (doc, prefix_name, addr);
+    } else if (INTERNET_ADDRESS_IS_GROUP (address)) {
+	InternetAddressGroup *group = INTERNET_ADDRESS_GROUP (address);
+	InternetAddressList *list = internet_address_group_get_members(group);
+	if (list) {
+	    int	length = internet_address_list_length(list);
+	    int i;
+
+	    for (i = 0; i < length; i++)
+		add_term_address_addr(doc,
+				      internet_address_list_get_address(list, i),
+				      prefix_name);
+	}
+    }
 }
 
 static void
@@ -475,7 +503,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;
@@ -624,8 +662,10 @@ index_file (Xapian::WritableDatabase db,
     add_term (doc, "type", "mail");
     add_term (doc, "source_id", "1");
 
-    add_term (doc, "msgid", message_id);
-    doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
+    if (message_id) {
+	add_term (doc, "msgid", message_id);
+	doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
+    }
 
     if (thread_ids->len) {
 	unsigned int i;
@@ -649,7 +689,7 @@ index_file (Xapian::WritableDatabase db,
 	doc.add_value (NOTMUCH_VALUE_THREAD, thread_id->str);
 
 	g_string_free (thread_id, TRUE);
-    } else {
+    } else if (message_id) {
 	/* If not referenced thread, use the message ID */
 	add_term (doc, "thread", message_id);
 	doc.add_value (NOTMUCH_VALUE_THREAD, message_id);
@@ -682,7 +722,8 @@ main (int argc, char **argv)
     GIOStatus gio_status;
     GError *error = NULL;
     int count;
-    struct timeval tv_start, tv_now;
+    struct timeval tv_start, tv_last, tv_now;
+    double elapsed;
 
     if (argc < 2) {
 	usage (argv[0]);
@@ -707,6 +748,7 @@ main (int argc, char **argv)
 	count = 0;
 
 	gettimeofday (&tv_start, NULL);
+	tv_last = tv_start;
 
 	while (1) {
 	    gio_status = g_io_channel_read_line (channel, &filename,
@@ -725,14 +767,21 @@ main (int argc, char **argv)
 	    g_free (filename);
 
 	    count++;
-	    if (count % 250 == 0) {
+	    if (count % 1000 == 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));
+			count, 1000 / ((tv_now.tv_sec - tv_last.tv_sec) +
+				       (tv_now.tv_usec - tv_last.tv_usec) / 1e6));
+		tv_last = tv_now;
 	    }
 	}
 
+	gettimeofday (&tv_now, NULL);
+	elapsed = (tv_now.tv_sec - tv_start.tv_sec +
+		   (tv_now.tv_usec - tv_start.tv_usec) / 1e6);
+	printf ("Completed indexing of %d messages in %g seconds (%g messages/second)\n",
+		count, elapsed, count / elapsed);
+
     } catch (const Xapian::Error &error) {
 	cerr << "A Xapian exception occurred: " << error.get_msg () << endl;
 	exit (1);