struct _notmuch_message {
notmuch_database_t *notmuch;
Xapian::docid doc_id;
+ int frozen;
char *message_id;
char *thread_id;
char *filename;
+ notmuch_message_file_t *message_file;
Xapian::Document doc;
};
-typedef struct _notmuch_terms {
- char prefix_char;
- Xapian::TermIterator iterator;
- Xapian::TermIterator iterator_end;
-} notmuch_terms_t;
-
-struct _notmuch_tags {
- notmuch_terms_t terms;
-};
-
/* "128 bits of thread-id ought to be enough for anybody" */
#define NOTMUCH_THREAD_ID_BITS 128
#define NOTMUCH_THREAD_ID_DIGITS (NOTMUCH_THREAD_ID_BITS / 4)
message->notmuch = notmuch;
message->doc_id = doc_id;
- message->message_id = NULL; /* lazily created */
- message->thread_id = NULL; /* lazily created */
- message->filename = NULL; /* lazily created */
+
+ message->frozen = 0;
+
+ /* Each of these will be lazily created as needed. */
+ message->message_id = NULL;
+ message->thread_id = NULL;
+ message->filename = NULL;
+ message->message_file = NULL;
/* This is C++'s creepy "placement new", which is really just an
* ugly way to call a constructor for a pre-allocated object. So
return message->message_id;
}
+const char *
+_notmuch_message_get_subject (notmuch_message_t *message)
+{
+ if (! message->message_file) {
+ notmuch_message_file_t *message_file;
+ const char *filename;
+
+ filename = notmuch_message_get_filename (message);
+ if (unlikely (filename == NULL))
+ return NULL;
+
+ message_file = _notmuch_message_file_open_ctx (message, filename);
+ if (unlikely (message_file == NULL))
+ return NULL;
+
+ message->message_file = message_file;
+ }
+
+ return notmuch_message_file_get_header (message->message_file,
+ "subject");
+}
+
const char *
notmuch_message_get_thread_id (notmuch_message_t *message)
{
strncmp ((*i).c_str (), _find_prefix ("thread"),
strlen (_find_prefix ("thread"))) == 0)
{
- INTERNAL_ERROR ("Message with document ID of %d has duplicate thread IDs.\n",
- message->doc_id);
+ INTERNAL_ERROR ("Message %s has duplicate thread IDs: %s and %s\n",
+ notmuch_message_get_message_id (message),
+ message->thread_id,
+ (*i).c_str () + 1);
}
#endif
return message->filename;
}
-/* 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_terms_destructor (notmuch_terms_t *terms)
-{
- terms->iterator.~TermIterator ();
- terms->iterator_end.~TermIterator ();
-
- return 0;
-}
-
-notmuch_terms_t *
-_notmuch_terms_create (void *ctx,
- Xapian::Document doc,
- const char *prefix_name)
+notmuch_tags_t *
+notmuch_message_get_tags (notmuch_message_t *message)
{
- notmuch_terms_t *terms;
- const char *prefix = _find_prefix (prefix_name);
+ const char *prefix = _find_prefix ("tag");
+ Xapian::TermIterator i, end;
+ notmuch_tags_t *tags;
+ std::string tag;
- /* Currently, notmuch_terms_t is written with the assumption that
- * any prefix its derivatives use will be only a single
- * character. */
+ /* Currently this iteration is written with the assumption that
+ * "tag" has a single-character prefix. */
assert (strlen (prefix) == 1);
- terms = talloc (ctx, notmuch_terms_t);
- if (unlikely (terms == NULL))
+ tags = _notmuch_tags_create (message);
+ if (unlikely (tags == NULL))
return NULL;
- terms->prefix_char = *prefix;
- new (&terms->iterator) Xapian::TermIterator;
- new (&terms->iterator_end) Xapian::TermIterator;
+ i = message->doc.termlist_begin ();
+ end = message->doc.termlist_end ();
- talloc_set_destructor (terms, _notmuch_terms_destructor);
+ i.skip_to (prefix);
- terms->iterator = doc.termlist_begin ();
- terms->iterator.skip_to (prefix);
- terms->iterator_end = doc.termlist_end ();
+ while (1) {
+ tag = *i;
- return terms;
-}
+ if (tag.empty () || tag[0] != *prefix)
+ break;
-/* The assertion is to ensure that 'type' is a derivative of
- * notmuch_terms_t in that it contains a notmuch_terms_t as its first
- * member. We do this by name of 'terms' as opposed to type, because
- * that's as clever as I've been so far. */
-#define _notmuch_terms_create_type(ctx, doc, prefix_name, type) \
- (COMPILE_TIME_ASSERT(offsetof(type, terms) == 0), \
- (type *) _notmuch_terms_create (ctx, doc, prefix_name))
+ _notmuch_tags_add_tag (tags, tag.c_str () + 1);
-notmuch_tags_t *
-notmuch_message_get_tags (notmuch_message_t *message)
-{
- return _notmuch_terms_create_type (message, message->doc, "tag",
- notmuch_tags_t);
+ i++;
+ }
+
+ _notmuch_tags_prepare_iterator (tags);
+
+ return tags;
}
void
return NOTMUCH_PRIVATE_STATUS_SUCCESS;
}
+/* Parse 'text' and add a term to 'message' for each parsed word. Each
+ * term will be added both prefixed (if prefix_name is not NULL) and
+ * also unprefixed). */
+notmuch_private_status_t
+_notmuch_message_gen_terms (notmuch_message_t *message,
+ const char *prefix_name,
+ const char *text)
+{
+ Xapian::TermGenerator *term_gen = message->notmuch->term_gen;
+
+ if (text == NULL)
+ return NOTMUCH_PRIVATE_STATUS_NULL_POINTER;
+
+ term_gen->set_document (message->doc);
+
+ if (prefix_name) {
+ const char *prefix = _find_prefix (prefix_name);
+
+ term_gen->index_text (text, 1, prefix);
+ }
+
+ term_gen->index_text (text);
+
+ 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
if (strlen (term) > NOTMUCH_TERM_MAX)
return NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG;
- message->doc.remove_term (term);
+ try {
+ message->doc.remove_term (term);
+ } catch (const Xapian::InvalidArgumentError) {
+ /* We'll let the philosopher's try to wrestle with the
+ * question of whether failing to remove that which was not
+ * there in the first place is failure. For us, we'll silently
+ * consider it all good. */
+ }
talloc_free (term);
status);
}
- _notmuch_message_sync (message);
+ if (! message->frozen)
+ _notmuch_message_sync (message);
return NOTMUCH_STATUS_SUCCESS;
}
status);
}
- _notmuch_message_sync (message);
+ if (! message->frozen)
+ _notmuch_message_sync (message);
return NOTMUCH_STATUS_SUCCESS;
}
void
-notmuch_message_destroy (notmuch_message_t *message)
-{
- talloc_free (message);
-}
-
-notmuch_bool_t
-_notmuch_terms_has_more (notmuch_terms_t *terms)
+notmuch_message_remove_all_tags (notmuch_message_t *message)
{
- std::string s;
-
- if (terms->iterator == terms->iterator_end)
- return FALSE;
+ notmuch_private_status_t status;
+ notmuch_tags_t *tags;
+ const char *tag;
- s = *terms->iterator;
- if (! s.empty () && s[0] == terms->prefix_char)
- return TRUE;
- else
- return FALSE;
-}
+ for (tags = notmuch_message_get_tags (message);
+ notmuch_tags_has_more (tags);
+ notmuch_tags_advance (tags))
+ {
+ tag = notmuch_tags_get (tags);
-const char *
-_notmuch_terms_get (notmuch_terms_t *terms)
-{
- return talloc_strdup (terms, (*terms->iterator).c_str () + 1);
-}
+ status = _notmuch_message_remove_term (message, "tag", tag);
+ if (status) {
+ INTERNAL_ERROR ("_notmuch_message_remove_term return unexpected value: %d\n",
+ status);
+ }
+ }
-void
-_notmuch_terms_advance (notmuch_terms_t *terms)
-{
- terms->iterator++;
+ if (! message->frozen)
+ _notmuch_message_sync (message);
}
void
-_notmuch_terms_destroy (notmuch_terms_t *terms)
-{
- talloc_free (terms);
-}
-
-notmuch_bool_t
-notmuch_tags_has_more (notmuch_tags_t *tags)
+notmuch_message_freeze (notmuch_message_t *message)
{
- return _notmuch_terms_has_more (&tags->terms);
+ message->frozen++;
}
-const char *
-notmuch_tags_get (notmuch_tags_t *tags)
-{
- return _notmuch_terms_get (&tags->terms);
-}
-
-void
-notmuch_tags_advance (notmuch_tags_t *tags)
+notmuch_status_t
+notmuch_message_thaw (notmuch_message_t *message)
{
- return _notmuch_terms_advance (&tags->terms);
+ if (message->frozen > 0) {
+ message->frozen--;
+ if (message->frozen == 0)
+ _notmuch_message_sync (message);
+ return NOTMUCH_STATUS_SUCCESS;
+ } else {
+ return NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW;
+ }
}
void
-notmuch_tags_destroy (notmuch_tags_t *tags)
+notmuch_message_destroy (notmuch_message_t *message)
{
- return _notmuch_terms_destroy (&tags->terms);
+ talloc_free (message);
}
projects / notmuch / blobdiff