From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 03/11] cli/insert: move add_file_to_database to a better place
Date: Mon, 22 Sep 2014 11:54:54 +0200 [thread overview]
Message-ID: <84d2fc033adbb5cbddb49a937b71ba1f74a701c0.1411379395.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
In-Reply-To: <cover.1411379395.git.jani@nikula.org>
Move add_file_to_database around to keep the filesystem related
functions grouped together, improving readability. No functional
changes.
---
notmuch-insert.c | 92 +++++++++++++++++++++++++++---------------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/notmuch-insert.c b/notmuch-insert.c
index 770275b..ccb091a 100644
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -294,52 +294,6 @@ copy_stdin (int fdin, int fdout)
return (!interrupted && !empty);
}
-/* Add the specified message file to the notmuch database, applying tags.
- * The file is renamed to encode notmuch tags as maildir flags. */
-static void
-add_file_to_database (notmuch_database_t *notmuch, const char *path,
- tag_op_list_t *tag_ops, notmuch_bool_t synchronize_flags)
-{
- notmuch_message_t *message;
- notmuch_status_t status;
-
- status = notmuch_database_add_message (notmuch, path, &message);
- switch (status) {
- case NOTMUCH_STATUS_SUCCESS:
- case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
- 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;
- }
-
- if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
- /* Don't change tags of an existing message. */
- if (synchronize_flags) {
- status = notmuch_message_tags_to_maildir_flags (message);
- if (status != NOTMUCH_STATUS_SUCCESS)
- fprintf (stderr, "Error: failed to sync tags to maildir flags\n");
- }
- } else {
- tag_op_flag_t flags = synchronize_flags ? TAG_FLAG_MAILDIR_SYNC : 0;
-
- tag_op_list_apply (message, tag_ops, flags);
- }
-
- notmuch_message_destroy (message);
-}
-
static notmuch_bool_t
write_message (void *ctx, int fdin, const char *dir, char **newpath)
{
@@ -389,6 +343,52 @@ write_message (void *ctx, int fdin, const char *dir, char **newpath)
return FALSE;
}
+/* Add the specified message file to the notmuch database, applying tags.
+ * The file is renamed to encode notmuch tags as maildir flags. */
+static void
+add_file_to_database (notmuch_database_t *notmuch, const char *path,
+ tag_op_list_t *tag_ops, notmuch_bool_t synchronize_flags)
+{
+ notmuch_message_t *message;
+ notmuch_status_t status;
+
+ status = notmuch_database_add_message (notmuch, path, &message);
+ switch (status) {
+ case NOTMUCH_STATUS_SUCCESS:
+ case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
+ 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;
+ }
+
+ if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
+ /* Don't change tags of an existing message. */
+ if (synchronize_flags) {
+ status = notmuch_message_tags_to_maildir_flags (message);
+ if (status != NOTMUCH_STATUS_SUCCESS)
+ fprintf (stderr, "Error: failed to sync tags to maildir flags\n");
+ }
+ } else {
+ tag_op_flag_t flags = synchronize_flags ? TAG_FLAG_MAILDIR_SYNC : 0;
+
+ tag_op_list_apply (message, tag_ops, flags);
+ }
+
+ notmuch_message_destroy (message);
+}
+
int
notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
{
--
1.7.2.5
next prev parent reply other threads:[~2014-09-22 9:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 9:54 [PATCH 00/11] notmuch insert updates Jani Nikula
2014-09-22 9:54 ` [PATCH 01/11] lib: actually return failures from notmuch_message_tags_to_maildir_flags Jani Nikula
2014-09-22 9:54 ` [PATCH 02/11] cli/insert: rename check_folder_name to is_valid_folder_name Jani Nikula
2014-09-22 9:54 ` Jani Nikula [this message]
2014-09-22 9:54 ` [PATCH 04/11] cli/insert: rename file copy function Jani Nikula
2014-09-22 9:54 ` [PATCH 05/11] cli/insert: clean up sync_dir Jani Nikula
2014-09-22 9:54 ` [PATCH 06/11] cli/insert: use a single recursive mkdir function Jani Nikula
2014-09-22 9:54 ` [PATCH 07/11] cli/insert: abstract temporary filename generation Jani Nikula
2014-09-22 9:54 ` [PATCH 08/11] cli/insert: rehash file writing functions Jani Nikula
2014-09-22 9:55 ` [PATCH 09/11] cli/insert: add fail path to add_file_to_database Jani Nikula
2014-09-26 20:09 ` David Bremner
2014-09-22 9:55 ` [PATCH 10/11] cli/insert: require succesful message indexing for success status Jani Nikula
2014-09-22 9:55 ` [PATCH 11/11] cli/insert: add post-insert hook Jani Nikula
2014-09-25 8:13 ` [PATCH 00/11] notmuch insert updates David Bremner
2014-09-25 19:54 ` Tomi Ollila
2014-09-26 6:48 ` David Bremner
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=84d2fc033adbb5cbddb49a937b71ba1f74a701c0.1411379395.git.jani@nikula.org \
--to=jani@nikula.org \
--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).