Walk address groups and parse each address separately

[notmuch] / notmuch-index-message.cc

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 60370b62b99621f6d8ec1eea491d0b5b96c003ad..02f250b419f01dd5d643f4f8d98d61fa13531567 100644 (file)
--- 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
@@ -253,6 +281,9 @@ skip_re_in_subject (const char *subject)
 {
     const char *s = subject;
 
+    if (subject == NULL)
+       return NULL;
+
     while (*s) {
        while (*s && isspace (*s))
            s++;
@@ -472,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;
@@ -722,7 +763,7 @@ 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) +