From: Peter Wang <novalazy@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 07/20] insert: add new message to database
Date: Sun, 25 Nov 2012 12:16:33 +1100 [thread overview]
Message-ID: <1353806206-29133-8-git-send-email-novalazy@gmail.com> (raw)
In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>
Add the new message to the notmuch database, renaming the file to encode
notmuch tags as maildir flags.
---
notmuch-insert.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 63a04dc..020dc29 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -153,6 +153,44 @@ copy_fd_data (int fdin, int fdout)
return TRUE;
}
+/* Add the specified message file to the notmuch database.
+ * The file is renamed to encode notmuch tags as maildir flags. */
+static notmuch_bool_t
+add_file_to_database (notmuch_database_t *notmuch, const char *path)
+{
+ notmuch_message_t *message;
+ notmuch_status_t status;
+
+ status = notmuch_database_add_message (notmuch, path, &message);
+ switch (status) {
+ case NOTMUCH_STATUS_SUCCESS:
+ break;
+ case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
+ fprintf (stderr, "Warning: duplicate message.\n");
+ break;
+ default:
+ case NOTMUCH_STATUS_FILE_NOT_EMAIL:
+ case NOTMUCH_STATUS_READ_ONLY_DATABASE:
+ case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
+ case NOTMUCH_STATUS_OUT_OF_MEMORY:
+ case NOTMUCH_STATUS_FILE_ERROR:
+ case NOTMUCH_STATUS_NULL_POINTER:
+ case NOTMUCH_STATUS_TAG_TOO_LONG:
+ case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
+ case NOTMUCH_STATUS_UNBALANCED_ATOMIC:
+ case NOTMUCH_STATUS_LAST_STATUS:
+ fprintf (stderr, "Error: failed to add `%s' to notmuch database: %s\n",
+ path, notmuch_status_to_string (status));
+ return FALSE;
+ }
+
+ notmuch_message_tags_to_maildir_flags (message);
+
+ notmuch_message_destroy (message);
+
+ return TRUE;
+}
+
static notmuch_bool_t
insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
const char *dir)
@@ -173,8 +211,17 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
}
if (!ret) {
unlink (tmppath);
+ return FALSE;
}
- return ret;
+
+ ret = add_file_to_database (notmuch, newpath);
+ if (!ret) {
+ /* XXX maybe there should be an option to keep the file in maildir? */
+ unlink (newpath);
+ return FALSE;
+ }
+
+ return TRUE;
}
int
--
1.7.12.1
next prev parent reply other threads:[~2012-11-25 1:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-25 1:16 [PATCH v2 00/20] insert command Peter Wang
2012-11-25 1:16 ` [PATCH v2 01/20] tag: factor out tag operation parsing Peter Wang
2012-11-25 16:13 ` Mark Walters
2012-11-25 1:16 ` [PATCH v2 02/20] tag: make tag operation parser public Peter Wang
2012-11-25 1:16 ` [PATCH v2 03/20] cli: add stub for insert command Peter Wang
2012-11-25 1:16 ` [PATCH v2 04/20] insert: open Maildir tmp file Peter Wang
2012-11-25 1:16 ` [PATCH v2 05/20] insert: copy stdin to " Peter Wang
2012-11-26 9:39 ` Tomi Ollila
2012-11-26 12:05 ` Peter Wang
2012-11-25 1:16 ` [PATCH v2 06/20] insert: move file from Maildir tmp to new Peter Wang
2012-11-25 1:16 ` Peter Wang [this message]
2012-11-25 1:16 ` [PATCH v2 08/20] insert: support --folder option Peter Wang
2012-11-25 1:16 ` [PATCH v2 09/20] insert: prevent writes outside Maildir hierarchy Peter Wang
2012-11-25 1:16 ` [PATCH v2 10/20] insert: apply default tags to new message Peter Wang
2012-11-25 1:16 ` [PATCH v2 11/20] insert: parse command-line tag operations Peter Wang
2012-11-25 1:16 ` [PATCH v2 12/20] insert: apply " Peter Wang
2012-11-25 1:16 ` [PATCH v2 13/20] insert: add --create-folder option Peter Wang
2012-11-25 1:16 ` [PATCH v2 14/20] insert: fsync after writing tmp file Peter Wang
2012-11-25 1:16 ` [PATCH v2 15/20] insert: fsync new directory after rename Peter Wang
2012-11-25 16:15 ` Mark Walters
2012-11-25 1:16 ` [PATCH v2 16/20] insert: trap SIGINT and clean up Peter Wang
2012-11-25 1:16 ` [PATCH v2 17/20] insert: add copyright line from notmuch-deliver Peter Wang
2012-11-25 1:16 ` [PATCH v2 18/20] test: add tests for insert Peter Wang
2012-11-25 16:23 ` Mark Walters
2012-11-25 1:16 ` [PATCH v2 19/20] man: document 'insert' command Peter Wang
2012-11-25 16:17 ` Mark Walters
2012-11-25 1:16 ` [PATCH v2 20/20] man: reference notmuch-insert.1 Peter Wang
2012-11-25 16:11 ` [PATCH v2 00/20] insert command Mark Walters
2012-11-25 19:21 ` David Bremner
2012-11-26 2:42 ` Peter Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353806206-29133-8-git-send-email-novalazy@gmail.com \
--to=novalazy@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).