X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage.cc;h=ee52672a6ca5e1c1d514a31bb63271ac03725baa;hp=bf9f1edb84b6404f1c06b35d8c76607eca4d2b73;hb=4b6063397ffcc13f38757e7052e3dc6649d9703c;hpb=d064bd696ccc443a7ece9cfc8816999c69943223

diff --git a/lib/message.cc b/lib/message.cc
index bf9f1edb..ee52672a 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -32,7 +32,7 @@ struct _notmuch_message {
     char *message_id;
     char *thread_id;
     char *in_reply_to;
-    char *filename;
+    notmuch_filename_list_t *filename_list;
     char *author;
     notmuch_message_file_t *message_file;
     notmuch_message_list_t *replies;
@@ -41,6 +41,23 @@ struct _notmuch_message {
     Xapian::Document doc;
 };
 
+#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
+
+struct maildir_flag_tag {
+    char flag;
+    const char *tag;
+    bool inverse;
+};
+
+/* ASCII ordered table of Maildir flags and associated tags */
+struct maildir_flag_tag flag2tag[] = {
+    { 'D', "draft",   false},
+    { 'F', "flagged", false},
+    { 'P', "passed",  false},
+    { 'R', "replied", false},
+    { 'S', "unread",  true }
+};
+
 /* 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
@@ -84,7 +101,7 @@ _notmuch_message_create_for_document (const void *talloc_owner,
     message->message_id = NULL;
     message->thread_id = NULL;
     message->in_reply_to = NULL;
-    message->filename = NULL;
+    message->filename_list = NULL;
     message->message_file = NULL;
     message->author = NULL;
 
@@ -415,9 +432,9 @@ _notmuch_message_add_filename (notmuch_message_t *message,
     void *local = talloc_new (message);
     char *direntry;
 
-    if (message->filename) {
-	talloc_free (message->filename);
-	message->filename = NULL;
+    if (message->filename_list) {
+	_notmuch_filename_list_destroy (message->filename_list);
+	message->filename_list = NULL;
     }
 
     if (filename == NULL)
@@ -448,28 +465,23 @@ _notmuch_message_clear_data (notmuch_message_t *message)
     message->doc.set_data ("");
 }
 
-const char *
-notmuch_message_get_filename (notmuch_message_t *message)
+static void
+_notmuch_message_ensure_filename_list (notmuch_message_t *message)
 {
     const char *prefix = _find_prefix ("file-direntry");
     int prefix_len = strlen (prefix);
     Xapian::TermIterator i;
-    char *colon, *direntry = NULL;
-    const char *db_path, *directory, *basename;
-    unsigned int directory_id;
-    void *local = talloc_new (message);
 
-    if (message->filename)
-	return message->filename;
+    if (message->filename_list)
+	return;
+
+    message->filename_list = _notmuch_filename_list_create (message);
 
     i = message->doc.termlist_begin ();
     i.skip_to (prefix);
 
-    if (i != message->doc.termlist_end ())
-	direntry = talloc_strdup (local, (*i).c_str ());
-
     if (i == message->doc.termlist_end () ||
-	strncmp (direntry, prefix, prefix_len))
+	strncmp ((*i).c_str (), prefix, prefix_len))
     {
 	/* A message document created by an old version of notmuch
 	 * (prior to rename support) will have the filename in the
@@ -484,39 +496,77 @@ notmuch_message_get_filename (notmuch_message_t *message)
 	if (data == NULL)
 	    INTERNAL_ERROR ("message with no filename");
 
-	message->filename = talloc_strdup (message, data);
+	_notmuch_filename_list_add_filename (message->filename_list, data);
 
-	return message->filename;
+	return;
     }
 
-    direntry += prefix_len;
+    for (; i != message->doc.termlist_end (); i++) {
+	void *local = talloc_new (message);
+	const char *db_path, *directory, *basename, *filename;
+	char *colon, *direntry = NULL;
+	unsigned int directory_id;
 
-    directory_id = strtol (direntry, &colon, 10);
+	/* Terminate loop at first term without desired prefix. */
+	if (strncmp ((*i).c_str (), prefix, prefix_len))
+	    break;
 
-    if (colon == NULL || *colon != ':')
-	INTERNAL_ERROR ("malformed direntry");
+	direntry = talloc_strdup (local, (*i).c_str ());
 
-    basename = colon + 1;
+	direntry += prefix_len;
 
-    *colon = '\0';
+	directory_id = strtol (direntry, &colon, 10);
 
-    db_path = notmuch_database_get_path (message->notmuch);
+	if (colon == NULL || *colon != ':')
+	    INTERNAL_ERROR ("malformed direntry");
 
-    directory = _notmuch_database_get_directory_path (local,
-						      message->notmuch,
-						      directory_id);
+	basename = colon + 1;
 
-    if (strlen (directory))
-	message->filename = talloc_asprintf (message, "%s/%s/%s",
-					     db_path, directory, basename);
-    else
-	message->filename = talloc_asprintf (message, "%s/%s",
-					     db_path, basename);
-    talloc_free ((void *) directory);
+	*colon = '\0';
 
-    talloc_free (local);
+	db_path = notmuch_database_get_path (message->notmuch);
+
+	directory = _notmuch_database_get_directory_path (local,
+							  message->notmuch,
+							  directory_id);
+
+	if (strlen (directory))
+	    filename = talloc_asprintf (message, "%s/%s/%s",
+					db_path, directory, basename);
+	else
+	    filename = talloc_asprintf (message, "%s/%s",
+					db_path, basename);
+
+	_notmuch_filename_list_add_filename (message->filename_list,
+					     filename);
+
+	talloc_free (local);
+    }
+}
+
+const char *
+notmuch_message_get_filename (notmuch_message_t *message)
+{
+    _notmuch_message_ensure_filename_list (message);
 
-    return message->filename;
+    if (message->filename_list == NULL)
+	return NULL;
+
+    if (message->filename_list->head == NULL ||
+	message->filename_list->head->filename == NULL)
+    {
+	INTERNAL_ERROR ("message with no filename");
+    }
+
+    return message->filename_list->head->filename;
+}
+
+notmuch_filenames_t *
+notmuch_message_get_filenames (notmuch_message_t *message)
+{
+    _notmuch_message_ensure_filename_list (message);
+
+    return _notmuch_filenames_create (message, message->filename_list);
 }
 
 notmuch_bool_t
@@ -713,6 +763,46 @@ _notmuch_message_remove_term (notmuch_message_t *message,
     return NOTMUCH_PRIVATE_STATUS_SUCCESS;
 }
 
+/* Change the message filename stored in the database.
+ *
+ * This change will not be reflected in the database until the next
+ * call to _notmuch_message_sync.
+ */
+notmuch_status_t
+_notmuch_message_rename (notmuch_message_t *message,
+			 const char *new_filename)
+{
+    void *local = talloc_new (message);
+    char *direntry;
+    Xapian::PostingIterator i, end;
+    Xapian::Document document;
+    notmuch_private_status_t private_status;
+    notmuch_status_t status;
+    const char *old_filename;
+
+    old_filename = notmuch_message_get_filename(message);
+    old_filename = talloc_reference(local, old_filename);
+    if (unlikely (! old_filename))
+	return NOTMUCH_STATUS_OUT_OF_MEMORY;
+
+    status = _notmuch_message_add_filename (message, new_filename);
+    if (status)
+	return status;
+
+    status = _notmuch_database_filename_to_direntry (local, message->notmuch,
+						     old_filename, &direntry);
+    if (status)
+	return status;
+
+    private_status = _notmuch_message_remove_term (message, "file-direntry", direntry);
+    status = COERCE_STATUS (private_status,
+			    "Unexpected error from _notmuch_message_remove_term");
+
+    talloc_free (local);
+
+    return status;
+}
+
 notmuch_status_t
 notmuch_message_add_tag (notmuch_message_t *message, const char *tag)
 {
@@ -769,6 +859,157 @@ notmuch_message_remove_tag (notmuch_message_t *message, const char *tag)
     return NOTMUCH_STATUS_SUCCESS;
 }
 
+notmuch_status_t
+notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)
+{
+    const char *flags;
+    notmuch_status_t status;
+    notmuch_filenames_t *filenames;
+    const char *filename;
+    char *combined_flags = talloc_strdup (message, "");
+    unsigned i;
+
+    for (filenames = notmuch_message_get_filenames (message);
+	 notmuch_filenames_valid (filenames);
+	 notmuch_filenames_move_to_next (filenames))
+    {
+	filename = notmuch_filenames_get (filenames);
+
+	flags = strstr (filename, ":2,");
+	if (! flags)
+	    continue;
+
+	flags += 3;
+
+	combined_flags = talloc_strdup_append (combined_flags, flags);
+    }
+
+    status = notmuch_message_freeze (message);
+    if (status)
+	return status;
+
+    for (i = 0; i < ARRAY_SIZE(flag2tag); i++) {
+	if ((strchr (combined_flags, flag2tag[i].flag) != NULL)
+	    ^ 
+	    flag2tag[i].inverse)
+	{
+	    status = notmuch_message_add_tag (message, flag2tag[i].tag);
+	} else {
+	    status = notmuch_message_remove_tag (message, flag2tag[i].tag);
+	}
+	if (status)
+	    return status;
+    }
+    status = notmuch_message_thaw (message);
+
+    talloc_free (combined_flags);
+
+    return status;
+}
+
+static void
+maildir_get_new_flags(notmuch_message_t *message, char *flags)
+{
+    notmuch_tags_t *tags;
+    const char *tag;
+    unsigned i;
+    char *p;
+
+    for (i = 0; i < ARRAY_SIZE(flag2tag); i++)
+	flags[i] = flag2tag[i].inverse ? flag2tag[i].flag : '\0';
+
+    for (tags = notmuch_message_get_tags (message);
+	 notmuch_tags_valid (tags);
+	 notmuch_tags_move_to_next (tags))
+    {
+	tag = notmuch_tags_get (tags);
+	for (i = 0; i < ARRAY_SIZE(flag2tag); i++) {
+	    if (strcmp(tag, flag2tag[i].tag) == 0)
+		flags[i] = flag2tag[i].inverse ? '\0' : flag2tag[i].flag;
+	}
+    }
+
+    p = flags;
+    for (i = 0; i < ARRAY_SIZE(flag2tag); i++) {
+	if (flags[i])
+	    *p++ = flags[i];
+    }
+    *p = '\0';
+}
+
+static char *
+maildir_get_subdir (char *filename)
+{
+    char *p, *subdir = NULL;
+
+    p = filename + strlen (filename) - 1;
+    while (p > filename + 3 && *p != '/')
+	p--;
+    if (*p == '/') {
+	subdir = p - 3;
+	if (subdir > filename && *(subdir - 1) != '/')
+	    subdir = NULL;
+    }
+    return subdir;
+}
+
+/* XXX: Needs to iterate over all filenames in the message
+ *
+ * XXX: Needs to ensure that existing, unsupported flags in the
+ *      filename are left unchanged (which also needs a test in the
+ *      test suite).
+ */
+notmuch_status_t
+notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
+{
+    char flags[ARRAY_SIZE(flag2tag)+1];
+    const char *filename, *p;
+    char *filename_new, *subdir = NULL;
+    int ret;
+
+    maildir_get_new_flags (message, flags);
+
+    filename = notmuch_message_get_filename (message);
+    /* TODO: Iterate over all file names. */
+    p = strstr(filename, ":2,");
+    if ((p && strcmp (p+3, flags) == 0) ||
+	(!p && flags[0] == '\0')) {
+	// Return if flags are not to be changed - this suppresses
+	// moving the message from new/ to cur/ during initial
+	// tagging.
+	return NOTMUCH_STATUS_SUCCESS;
+    }
+    if (!p)
+	p = filename + strlen(filename);
+
+    filename_new = (char*)talloc_size(message, (p-filename) + 3 + sizeof(flags));
+    if (unlikely (filename_new == NULL))
+	return NOTMUCH_STATUS_OUT_OF_MEMORY;
+
+    memcpy(filename_new, filename, p-filename);
+    filename_new[p-filename] = '\0';
+
+    /* If message is in new/ move it under cur/. */
+    subdir = maildir_get_subdir (filename_new);
+    if (subdir && memcmp (subdir, "new/", 4) == 0)
+	memcpy (subdir, "cur/", 4);
+
+    strcpy (filename_new+(p-filename), ":2,");
+    strcpy (filename_new+(p-filename)+3, flags);
+
+    if (strcmp (filename, filename_new) != 0) {
+	ret = rename (filename, filename_new);
+	if (ret == -1) {
+	    perror (talloc_asprintf (message, "rename of %s to %s failed",
+				     filename, filename_new));
+	    exit (1);
+	}
+	return _notmuch_message_rename (message, filename_new);
+	/* _notmuch_message_sync is our caller. Do not call it here. */
+    }
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
 notmuch_status_t
 notmuch_message_remove_all_tags (notmuch_message_t *message)
 {