X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=message.cc;h=4e59fce09d980c75687641457195e76e71b00c1f;hp=8ca8fdee1871b0f10f7700477e1e3da76f0553b4;hb=c78358fa8adc0e8fa4f889e479df76e8df186264;hpb=8ad4350fef132b016bbab5eeb1c4a713e51035c6 diff --git a/message.cc b/message.cc index 8ca8fdee..4e59fce0 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; }; @@ -66,6 +69,7 @@ prefix_t BOOLEAN_PREFIX[] = { { "email", "E" }, { "date", "D" }, { "label", "L" }, + { "tag", "L" }, { "source_id", "I" }, { "attachment_extension", "O" }, { "msgid", "Q" }, @@ -104,16 +108,19 @@ _notmuch_message_destructor (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_destructor); @@ -128,12 +135,19 @@ 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 @@ -166,7 +180,7 @@ notmuch_message_get_tags (notmuch_message_t *message) 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; @@ -176,14 +190,14 @@ notmuch_thread_ids_t * notmuch_message_get_thread_ids (notmuch_message_t *message) { notmuch_thread_ids_t *thread_ids; - const char *id_str; + std::string 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); + id_str = message->doc.get_value (NOTMUCH_VALUE_THREAD); + thread_ids->next = talloc_strdup (message, id_str.c_str ()); /* Initialize thread_ids->current and terminate first ID. */ notmuch_thread_ids_advance (thread_ids); @@ -191,6 +205,151 @@ notmuch_message_get_thread_ids (notmuch_message_t *message) return thread_ids; } +void +thread_id_generate (thread_id_t *thread_id) +{ + static int seeded = 0; + FILE *dev_random; + uint32_t value; + char *s; + int i; + + if (! seeded) { + dev_random = fopen ("/dev/random", "r"); + if (dev_random == NULL) { + srand (time (NULL)); + } else { + fread ((void *) &value, sizeof (value), 1, dev_random); + srand (value); + fclose (dev_random); + } + seeded = 1; + } + + s = thread_id->str; + for (i = 0; i < NOTMUCH_THREAD_ID_DIGITS; i += 8) { + value = rand (); + sprintf (s, "%08x", value); + s += 8; + } +} + +/* Synchronize changes made to message->doc into the database. */ +static void +_notmuch_message_sync (notmuch_message_t *message) +{ + Xapian::WritableDatabase *db = message->notmuch->xapian_db; + + db->replace_document (message->doc_id, message->doc); +} + +/* Add a name:value term to 'message', (the actual term will be + * encoded by prefixing the value with a short prefix). See + * NORMAL_PREFIX and BOOLEAN_PREFIX arrays for the mapping of term + * names to prefix values. + * + * This change will not be reflected in the database until the next + * call to _notmuch_message_set_sync. */ +notmuch_private_status_t +_notmuch_message_add_term (notmuch_message_t *message, + const char *prefix_name, + const char *value) +{ + + char *term; + + if (value == NULL) + return NOTMUCH_PRIVATE_STATUS_NULL_POINTER; + + term = talloc_asprintf (message, "%s%s", + _find_prefix (prefix_name), value); + + if (strlen (term) > NOTMUCH_TERM_MAX) + return NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG; + + message->doc.add_term (term); + + talloc_free (term); + + return NOTMUCH_PRIVATE_STATUS_SUCCESS; +} + +/* Remove a name:value term from 'message', (the actual term will be + * encoded by prefixing the value with a short prefix). See + * NORMAL_PREFIX and BOOLEAN_PREFIX arrays for the mapping of term + * names to prefix values. + * + * This change will not be reflected in the database until the next + * call to _notmuch_message_set_sync. */ +notmuch_private_status_t +_notmuch_message_remove_term (notmuch_message_t *message, + const char *prefix_name, + const char *value) +{ + char *term; + + if (value == NULL) + return NOTMUCH_PRIVATE_STATUS_NULL_POINTER; + + term = talloc_asprintf (message, "%s%s", + _find_prefix (prefix_name), value); + + if (strlen (term) > NOTMUCH_TERM_MAX) + return NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG; + + message->doc.remove_term (term); + + talloc_free (term); + + return NOTMUCH_PRIVATE_STATUS_SUCCESS; +} + +notmuch_status_t +notmuch_message_add_tag (notmuch_message_t *message, const char *tag) +{ + notmuch_private_status_t status; + + if (tag == NULL) + return NOTMUCH_STATUS_NULL_POINTER; + + if (strlen (tag) > NOTMUCH_TAG_MAX) + return NOTMUCH_STATUS_TAG_TOO_LONG; + + status = _notmuch_message_add_term (message, "tag", tag); + if (status) { + fprintf (stderr, "Internal error: _notmuch_message_add_term return unexpected value: %d\n", + status); + exit (1); + } + + _notmuch_message_sync (message); + + return NOTMUCH_STATUS_SUCCESS; +} + +notmuch_status_t +notmuch_message_remove_tag (notmuch_message_t *message, const char *tag) +{ + notmuch_private_status_t status; + + if (tag == NULL) + return NOTMUCH_STATUS_NULL_POINTER; + + if (strlen (tag) > NOTMUCH_TAG_MAX) + return NOTMUCH_STATUS_TAG_TOO_LONG; + + status = _notmuch_message_remove_term (message, "tag", tag); + if (status) { + fprintf (stderr, "Internal error: _notmuch_message_remove_term return unexpected value: %d\n", + status); + exit (1); + } + + _notmuch_message_sync (message); + + return NOTMUCH_STATUS_SUCCESS; +} + void notmuch_message_destroy (notmuch_message_t *message) {