Xapian::Document doc;
};
-/* "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)
-typedef struct _thread_id {
- char str[NOTMUCH_THREAD_ID_DIGITS + 1];
-} thread_id_t;
-
/* 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
unsigned int doc_id;
char *term;
- if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) {
- *status_ret = NOTMUCH_PRIVATE_STATUS_READONLY_DATABASE;
- return NULL;
- }
-
*status_ret = NOTMUCH_PRIVATE_STATUS_SUCCESS;
message = notmuch_database_find_message (notmuch, message_id);
return NULL;
}
+ if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
+ INTERNAL_ERROR ("Failure to ensure database is writable.");
+
db = static_cast<Xapian::WritableDatabase *> (notmuch->xapian_db);
try {
- doc.add_term (term);
+ doc.add_term (term, 0);
talloc_free (term);
doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
return _notmuch_messages_create (message->replies);
}
-/* Set the filename for 'message' to 'filename'.
- *
- * XXX: We should still figure out if we think it's important to store
- * multiple filenames for email messages with identical message IDs.
+/* Add an additional 'filename' for 'message'.
*
* This change will not be reflected in the database until the next
* call to _notmuch_message_set_sync. */
notmuch_status_t
-_notmuch_message_set_filename (notmuch_message_t *message,
+_notmuch_message_add_filename (notmuch_message_t *message,
const char *filename)
{
- const char *relative, *directory, *basename;
- char *term;
- Xapian::docid directory_id;
notmuch_status_t status;
void *local = talloc_new (message);
+ char *direntry;
if (message->filename) {
talloc_free (message->filename);
if (filename == NULL)
INTERNAL_ERROR ("Message filename cannot be NULL.");
- relative = _notmuch_database_relative_path (message->notmuch, filename);
-
- status = _notmuch_database_split_path (local, relative,
- &directory, &basename);
+ status = _notmuch_database_filename_to_direntry (local,
+ message->notmuch,
+ filename, &direntry);
if (status)
return status;
- status = _notmuch_database_find_directory_id (message->notmuch, directory,
- &directory_id);
- if (status)
- return status;
-
- term = talloc_asprintf (local, "%s%u:%s",
- _find_prefix ("direntry"), directory_id, basename);
-
- message->doc.add_term (term);
+ _notmuch_message_add_term (message, "file-direntry", direntry);
talloc_free (local);
return NOTMUCH_STATUS_SUCCESS;
}
+char *
+_notmuch_message_talloc_copy_data (notmuch_message_t *message)
+{
+ return talloc_strdup (message, message->doc.get_data ().c_str ());
+}
+
+void
+_notmuch_message_clear_data (notmuch_message_t *message)
+{
+ message->doc.set_data ("");
+}
+
const char *
notmuch_message_get_filename (notmuch_message_t *message)
{
- const char *prefix = _find_prefix ("direntry");
+ const char *prefix = _find_prefix ("file-direntry");
int prefix_len = strlen (prefix);
Xapian::TermIterator i;
char *direntry, *colon;
if (i == message->doc.termlist_end () ||
strncmp (direntry, prefix, prefix_len))
{
- INTERNAL_ERROR ("message with no filename");
+ /* A message document created by an old version of notmuch
+ * (prior to rename support) will have the filename in the
+ * data of the document rather than as a file-direntry term.
+ *
+ * It would be nice to do the upgrade of the document directly
+ * here, but the database is likely open in read-only mode. */
+ const char *data;
+
+ data = message->doc.get_data ().c_str ();
+
+ if (data == NULL)
+ INTERNAL_ERROR ("message with no filename");
+
+ message->filename = talloc_strdup (message, data);
+
+ return message->filename;
}
direntry += prefix_len;
Xapian::sortable_serialise (time_value));
}
-static 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;
- }
-}
-
-void
-_notmuch_message_ensure_thread_id (notmuch_message_t *message)
-{
- /* If not part of any existing thread, generate a new thread_id. */
- thread_id_t thread_id;
-
- thread_id_generate (&thread_id);
- _notmuch_message_add_term (message, "thread", thread_id.str);
-}
-
/* Synchronize changes made to message->doc out into the database. */
void
_notmuch_message_sync (notmuch_message_t *message)
if (strlen (term) > NOTMUCH_TERM_MAX)
return NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG;
- message->doc.add_term (term);
+ message->doc.add_term (term, 0);
talloc_free (term);
notmuch_status_t
notmuch_message_add_tag (notmuch_message_t *message, const char *tag)
{
- notmuch_private_status_t status;
+ notmuch_private_status_t private_status;
+ notmuch_status_t status;
+
+ status = _notmuch_database_ensure_writable (message->notmuch);
+ if (status)
+ return 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) {
+ private_status = _notmuch_message_add_term (message, "tag", tag);
+ if (private_status) {
INTERNAL_ERROR ("_notmuch_message_add_term return unexpected value: %d\n",
- status);
+ private_status);
}
if (! message->frozen)
notmuch_status_t
notmuch_message_remove_tag (notmuch_message_t *message, const char *tag)
{
- notmuch_private_status_t status;
+ notmuch_private_status_t private_status;
+ notmuch_status_t status;
+
+ status = _notmuch_database_ensure_writable (message->notmuch);
+ if (status)
+ return 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) {
+ private_status = _notmuch_message_remove_term (message, "tag", tag);
+ if (private_status) {
INTERNAL_ERROR ("_notmuch_message_remove_term return unexpected value: %d\n",
- status);
+ private_status);
}
if (! message->frozen)
return NOTMUCH_STATUS_SUCCESS;
}
-void
+notmuch_status_t
notmuch_message_remove_all_tags (notmuch_message_t *message)
{
- notmuch_private_status_t status;
+ notmuch_private_status_t private_status;
+ notmuch_status_t status;
notmuch_tags_t *tags;
const char *tag;
+ status = _notmuch_database_ensure_writable (message->notmuch);
+ if (status)
+ return status;
+
for (tags = notmuch_message_get_tags (message);
notmuch_tags_has_more (tags);
notmuch_tags_advance (tags))
{
tag = notmuch_tags_get (tags);
- status = _notmuch_message_remove_term (message, "tag", tag);
- if (status) {
+ private_status = _notmuch_message_remove_term (message, "tag", tag);
+ if (private_status) {
INTERNAL_ERROR ("_notmuch_message_remove_term return unexpected value: %d\n",
- status);
+ private_status);
}
}
if (! message->frozen)
_notmuch_message_sync (message);
+
+ return NOTMUCH_STATUS_SUCCESS;
}
-void
+notmuch_status_t
notmuch_message_freeze (notmuch_message_t *message)
{
+ notmuch_status_t status;
+
+ status = _notmuch_database_ensure_writable (message->notmuch);
+ if (status)
+ return status;
+
message->frozen++;
+
+ return NOTMUCH_STATUS_SUCCESS;
}
notmuch_status_t
notmuch_message_thaw (notmuch_message_t *message)
{
+ notmuch_status_t status;
+
+ status = _notmuch_database_ensure_writable (message->notmuch);
+ if (status)
+ return status;
+
if (message->frozen > 0) {
message->frozen--;
if (message->frozen == 0)
projects / notmuch / blobdiff