X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=message.cc;h=22c7598d05e6d721b31e3791e569e7da8bf4a210;hp=5d99321d01a9c1d19b6d359b152ee46125e502f9;hb=2afd95bfc2ef2241f7ef80b592c349aac67a28d1;hpb=466a7bbf620e4bf1b57097a6d3c474159c475b6d diff --git a/message.cc b/message.cc index 5d99321d..22c7598d 100644 --- a/message.cc +++ b/message.cc @@ -24,6 +24,9 @@ #include struct _notmuch_message { + notmuch_database_t *notmuch; + Xapian::docid doc_id; + char *message_id; Xapian::Document doc; }; @@ -32,8 +35,72 @@ struct _notmuch_tags { Xapian::TermIterator iterator_end; }; +struct _notmuch_thread_ids { + char *current; + char *next; +}; + +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) + +/* These prefix values are specifically chosen to be compatible + * with sup, (http://sup.rubyforge.org), written by + * William Morgan , and released + * under the GNU GPL v2. + */ + +typedef struct { + const char *name; + const char *prefix; +} prefix_t; + +prefix_t NORMAL_PREFIX[] = { + { "subject", "S" }, + { "body", "B" }, + { "from_name", "FN" }, + { "to_name", "TN" }, + { "name", "N" }, + { "attachment", "A" } +}; + +prefix_t BOOLEAN_PREFIX[] = { + { "type", "K" }, + { "from_email", "FE" }, + { "to_email", "TE" }, + { "email", "E" }, + { "date", "D" }, + { "label", "L" }, + { "tag", "L" }, + { "source_id", "I" }, + { "attachment_extension", "O" }, + { "msgid", "Q" }, + { "thread", "H" }, + { "ref", "R" } +}; + +const char * +_find_prefix (const char *name) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE (NORMAL_PREFIX); i++) + if (strcmp (name, NORMAL_PREFIX[i].name) == 0) + return NORMAL_PREFIX[i].prefix; + + for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX); i++) + if (strcmp (name, BOOLEAN_PREFIX[i].name) == 0) + return BOOLEAN_PREFIX[i].prefix; + + return ""; +} + +/* We end up having to call the destructor explicitly because we had + * to use "placement new" in order to initialize C++ objects within a + * block that we allocated with talloc. So C++ is making talloc + * slightly less simple to use, (we wouldn't need + * talloc_set_destructor at all otherwise). + */ static int -_notmuch_message_destroy (notmuch_message_t *message) +_notmuch_message_destructor (notmuch_message_t *message) { message->doc.~Document (); @@ -41,19 +108,22 @@ _notmuch_message_destroy (notmuch_message_t *message) } notmuch_message_t * -_notmuch_message_create (notmuch_results_t *owner, +_notmuch_message_create (const void *talloc_owner, notmuch_database_t *notmuch, - Xapian::docid doc_id) + unsigned int doc_id) { notmuch_message_t *message; - message = talloc (owner, notmuch_message_t); + message = talloc (talloc_owner, notmuch_message_t); if (unlikely (message == NULL)) return NULL; + message->notmuch = notmuch; + message->doc_id = doc_id; + message->message_id = NULL; /* lazily created */ new (&message->doc) Xapian::Document; - talloc_set_destructor (message, _notmuch_message_destroy); + talloc_set_destructor (message, _notmuch_message_destructor); message->doc = notmuch->xapian_db->get_document (doc_id); @@ -65,16 +135,29 @@ notmuch_message_get_message_id (notmuch_message_t *message) { Xapian::TermIterator i; + if (message->message_id) + return message->message_id; + i = message->doc.termlist_begin (); - i.skip_to ("Q"); - if (i != message->doc.termlist_end ()) - return talloc_strdup (message, (*i).c_str () + 1); - else + i.skip_to (_find_prefix ("msgid")); + + /* XXX: This should really be an internal error, but we'll need to + * fix the add_message side of things first. */ + if (i == message->doc.termlist_end ()) return NULL; + + message->message_id = talloc_strdup (message, (*i).c_str () + 1); + return message->message_id; } +/* We end up having to call the destructors explicitly because we had + * to use "placement new" in order to initialize C++ objects within a + * block that we allocated with talloc. So C++ is making talloc + * slightly less simple to use, (we wouldn't need + * talloc_set_destructor at all otherwise). + */ static int -_notmuch_tags_destroy (notmuch_tags_t *tags) +_notmuch_tags_destructor (notmuch_tags_t *tags) { tags->iterator.~TermIterator (); tags->iterator_end.~TermIterator (); @@ -94,15 +177,40 @@ notmuch_message_get_tags (notmuch_message_t *message) new (&tags->iterator) Xapian::TermIterator; new (&tags->iterator_end) Xapian::TermIterator; - talloc_set_destructor (tags, _notmuch_tags_destroy); + talloc_set_destructor (tags, _notmuch_tags_destructor); tags->iterator = message->doc.termlist_begin (); - tags->iterator.skip_to ("L"); + tags->iterator.skip_to (_find_prefix ("tag")); tags->iterator_end = message->doc.termlist_end (); return tags; } +notmuch_thread_ids_t * +notmuch_message_get_thread_ids (notmuch_message_t *message) +{ + notmuch_thread_ids_t *thread_ids; + const char *id_str; + + thread_ids = talloc (message, notmuch_thread_ids_t); + if (unlikely (thread_ids == NULL)) + return NULL; + + id_str = message->doc.get_value (NOTMUCH_VALUE_THREAD).c_str (); + thread_ids->next = talloc_strdup (message, id_str); + + /* Initialize thread_ids->current and terminate first ID. */ + notmuch_thread_ids_advance (thread_ids); + + return thread_ids; +} + +void +notmuch_message_destroy (notmuch_message_t *message) +{ + talloc_free (message); +} + notmuch_bool_t notmuch_tags_has_more (notmuch_tags_t *tags) { @@ -129,3 +237,36 @@ notmuch_tags_advance (notmuch_tags_t *tags) { tags->iterator++; } + +void +notmuch_tags_destroy (notmuch_tags_t *tags) +{ + talloc_free (tags); +} + +notmuch_bool_t +notmuch_thread_ids_has_more (notmuch_thread_ids_t *thread_ids) +{ + if (thread_ids->current == NULL || *thread_ids->current == '\0') + return FALSE; + else + return TRUE; +} + +const char * +notmuch_thread_ids_get (notmuch_thread_ids_t *thread_ids) +{ + return thread_ids->current; +} + +void +notmuch_thread_ids_advance (notmuch_thread_ids_t *thread_ids) +{ + thread_ids->current = strsep (&thread_ids->next, ","); +} + +void +notmuch_thread_ids_destroy (notmuch_thread_ids_t *thread_ids) +{ + talloc_free (thread_ids); +}