From 1b11a99cbdc4a848c61202bd733f7ff96f2b5974 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 3 Oct 2014 23:18:58 +0200 Subject: [PATCH] [Patch v2.5 2/4] cli/insert: add fail path to add_file_to_database --- ea/82e6e1371dd8b8c2bc01ca6cbb0b6efa5ee650 | 189 ++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 ea/82e6e1371dd8b8c2bc01ca6cbb0b6efa5ee650 diff --git a/ea/82e6e1371dd8b8c2bc01ca6cbb0b6efa5ee650 b/ea/82e6e1371dd8b8c2bc01ca6cbb0b6efa5ee650 new file mode 100644 index 000000000..5446d9e75 --- /dev/null +++ b/ea/82e6e1371dd8b8c2bc01ca6cbb0b6efa5ee650 @@ -0,0 +1,189 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8D8F9431FC0 + for ; Fri, 3 Oct 2014 14:19:54 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id fzeQLSamo+md for ; + Fri, 3 Oct 2014 14:19:48 -0700 (PDT) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id DC7A1431FC3 + for ; Fri, 3 Oct 2014 14:19:35 -0700 (PDT) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1XaAGF-0000LL-2p; Fri, 03 Oct 2014 18:19:35 -0300 +Received: (nullmailer pid 21177 invoked by uid 1000); Fri, 03 Oct 2014 + 21:19:08 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v2.5 2/4] cli/insert: add fail path to add_file_to_database +Date: Fri, 3 Oct 2014 23:18:58 +0200 +Message-Id: <1412371140-21051-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.0 +In-Reply-To: <1412371140-21051-1-git-send-email-david@tethera.net> +References: <1412371140-21051-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 03 Oct 2014 21:19:54 -0000 + +From: Jani Nikula + +Handle failures gracefully in add_file_to_database, renamed simply +add_file while at it. Add keep option to not remove the message from +database if tagging or tag syncing to maildir flags fails. Expand the +function documentation to cover the changes. +--- + notmuch-insert.c | 99 ++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 64 insertions(+), 35 deletions(-) + +diff --git a/notmuch-insert.c b/notmuch-insert.c +index 5ef6e66..0ea4380 100644 +--- a/notmuch-insert.c ++++ b/notmuch-insert.c +@@ -364,50 +364,80 @@ FAIL: + return NULL; + } + +-/* 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) ++/* ++ * Add the specified message file to the notmuch database, applying ++ * tags in tag_ops. If synchronize_flags is TRUE, the tags are ++ * synchronized to maildir flags (which may result in message file ++ * rename). ++ * ++ * Return NOTMUCH_STATUS_SUCCESS on success, errors otherwise. If keep ++ * is TRUE, errors in tag changes and flag syncing are ignored and ++ * success status is returned; otherwise such errors cause the message ++ * to be removed from the database. Failure to add the message to the ++ * database results in error status regardless of keep. ++ */ ++static notmuch_status_t ++add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops, ++ notmuch_bool_t synchronize_flags, notmuch_bool_t keep) + { + 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"); ++ if (status == NOTMUCH_STATUS_SUCCESS) { ++ status = tag_op_list_apply (message, tag_ops, 0); ++ if (status) { ++ fprintf (stderr, "%s: failed to apply tags to file '%s': %s\n", ++ keep ? "Warning" : "Error", ++ path, notmuch_status_to_string (status)); ++ goto DONE; + } ++ } else if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) { ++ status = NOTMUCH_STATUS_SUCCESS; ++ } else if (status == NOTMUCH_STATUS_FILE_NOT_EMAIL) { ++ fprintf (stderr, "Error: delivery of non-mail file: '%s'\n", path); ++ goto FAIL; + } else { +- tag_op_flag_t flags = synchronize_flags ? TAG_FLAG_MAILDIR_SYNC : 0; ++ fprintf (stderr, "Error: failed to add '%s' to notmuch database: %s\n", ++ path, notmuch_status_to_string (status)); ++ goto FAIL; ++ } + +- tag_op_list_apply (message, tag_ops, flags); ++ if (synchronize_flags) { ++ status = notmuch_message_tags_to_maildir_flags (message); ++ if (status != NOTMUCH_STATUS_SUCCESS) ++ fprintf (stderr, "%s: failed to sync tags to maildir flags for '%s': %s\n", ++ keep ? "Warning" : "Error", ++ path, notmuch_status_to_string (status)); ++ ++ /* ++ * Note: Unfortunately a failed maildir flag sync might ++ * already have renamed the file, in which case the cleanup ++ * path may fail. ++ */ + } + ++ DONE: + notmuch_message_destroy (message); ++ ++ if (status) { ++ if (keep) { ++ status = NOTMUCH_STATUS_SUCCESS; ++ } else { ++ notmuch_status_t cleanup_status; ++ ++ cleanup_status = notmuch_database_remove_message (notmuch, path); ++ if (cleanup_status != NOTMUCH_STATUS_SUCCESS && ++ cleanup_status != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) { ++ fprintf (stderr, "Warning: failed to remove '%s' from database " ++ "after errors: %s. Please run 'notmuch new' to fix.\n", ++ path, notmuch_status_to_string (cleanup_status)); ++ } ++ } ++ } ++ ++ FAIL: ++ return status; + } + + int +@@ -508,8 +538,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) + /* Add the message to the index. + * Even if adding the message to the notmuch database fails, + * the message is on disk and we consider the delivery completed. */ +- add_file_to_database (notmuch, newpath, tag_ops, +- synchronize_flags); ++ add_file (notmuch, newpath, tag_ops, synchronize_flags, TRUE); + + notmuch_database_destroy (notmuch); + return EXIT_SUCCESS; +-- +2.1.0 + -- 2.26.2