diff options
| author | Jani Nikula <jani@nikula.org> | 2017-09-16 17:59:02 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-09-17 20:00:32 -0300 |
| commit | 930d0aefb12ffaeb9e5afa3dd78edc5cb80baa7c (patch) | |
| tree | 0daf58560c402b62ba764afc1737fa96725fec68 /lib | |
| parent | 77cbd334bd8e83ab195c1d7f5d930ec792c3614a (diff) | |
lib: abstract content type indexing
Make the follow-up change of indexing signature content types
easier. No functional changes.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/index.cc | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/lib/index.cc b/lib/index.cc index 2b98b588..64bc92a5 100644 --- a/lib/index.cc +++ b/lib/index.cc @@ -351,6 +351,19 @@ _index_address_list (notmuch_message_t *message, } } +static void +_index_content_type (notmuch_message_t *message, GMimeObject *part) +{ + GMimeContentType *content_type = g_mime_object_get_content_type (part); + if (content_type) { + char *mime_string = g_mime_content_type_to_string (content_type); + if (mime_string) { + _notmuch_message_gen_terms (message, "mimetype", mime_string); + g_free (mime_string); + } + } +} + /* Callback to generate terms for each mime part of a message. */ static void _index_mime_part (notmuch_message_t *message, @@ -361,6 +374,7 @@ _index_mime_part (notmuch_message_t *message, GMimeDataWrapper *wrapper; GByteArray *byte_array; GMimeContentDisposition *disposition; + GMimeContentType *content_type; char *body; const char *charset; @@ -370,15 +384,7 @@ _index_mime_part (notmuch_message_t *message, return; } - GMimeContentType *content_type = g_mime_object_get_content_type(part); - if (content_type) { - char *mime_string = g_mime_content_type_to_string(content_type); - if (mime_string) - { - _notmuch_message_gen_terms (message, "mimetype", mime_string); - g_free(mime_string); - } - } + _index_content_type (message, part); if (GMIME_IS_MULTIPART (part)) { GMimeMultipart *multipart = GMIME_MULTIPART (part); @@ -447,6 +453,8 @@ _index_mime_part (notmuch_message_t *message, g_mime_stream_mem_set_owner (GMIME_STREAM_MEM (stream), FALSE); filter = g_mime_stream_filter_new (stream); + + content_type = g_mime_object_get_content_type (part); discard_non_term_filter = notmuch_filter_discard_non_term_new (content_type); g_mime_stream_filter_add (GMIME_STREAM_FILTER (filter), |