[sup-compat] Don't index mime parts with content-disposition of attachment

[notmuch] / notmuch-index-message.cc

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 3bb62f659dcdc29515bb03c616a56db569b586a3..6795430b8c72aa8d8e8e34c6027c561851366a92 100644 (file)
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -269,12 +269,23 @@ 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++;
+       }
+    }
 }
 
 /* Return one or more thread_ids, (as a GPtrArray of strings), for the
@@ -401,6 +412,7 @@ gen_terms_part (Xapian::TermGenerator term_gen,
     GMimeStream *stream;
     GMimeDataWrapper *wrapper;
     GByteArray *byte_array;
+    GMimeContentDisposition *disposition;
     char *body;
 
     if (GMIME_IS_MULTIPART (part)) {
@@ -427,6 +439,14 @@ gen_terms_part (Xapian::TermGenerator term_gen,
        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);