From be93ee388b6754eb33e0137feedd8e0b825d9af3 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 28 Sep 2014 17:40:57 +0300 Subject: [PATCH] [PATCH v2 1/3] cli/insert: add fail path to add_file_to_database --- c9/78b191929910e40d9356b6c522e9252b8fd9a9 | 209 ++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 c9/78b191929910e40d9356b6c522e9252b8fd9a9 diff --git a/c9/78b191929910e40d9356b6c522e9252b8fd9a9 b/c9/78b191929910e40d9356b6c522e9252b8fd9a9 new file mode 100644 index 000000000..d95c1419a --- /dev/null +++ b/c9/78b191929910e40d9356b6c522e9252b8fd9a9 @@ -0,0 +1,209 @@ +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 2CA17431FC2 + for ; Sun, 28 Sep 2014 07:41:11 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 bY31HXN5-c52 for ; + Sun, 28 Sep 2014 07:41:06 -0700 (PDT) +Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com + [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 8A0D4431FBF + for ; Sun, 28 Sep 2014 07:41:06 -0700 (PDT) +Received: by mail-wi0-f180.google.com with SMTP id q5so1818710wiv.13 + for ; Sun, 28 Sep 2014 07:41:05 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:in-reply-to:references; + bh=YW+Nxie2xerdBnEr05PSaMJt5Yq5ucTNH6q8mM0zOMg=; + b=hA6rRoWQaf+68Ig6iTZegZcfZBpWCLBQCiDtHXf4rwdCQ6IBE8DIi/f8NcSFh7/vG2 + x4bDDsY8zyDHQ+Hyz4clft4kpTb+LIAMYpVt2S9ZZ7qvIvoXGLXr9OjGuptntwJ6WKJ3 + aKlIS701wBp0S0M89iACDOhhUBb/KFB1fbBsAMXInpCQbZWE8FI3L5qKJD5MEZmKWNWv + HiBck72zRikXjGQ/ckaCGKRYMhND+geMzC3Hyer2h289GTNF3WlS5VLoa3K6kjWo5X6+ + +pBjXAakSkC0RqsKI20bt1D641+CkeK13yTvmzb2uNQURmnestn0dgBtlDpaObUYljee + 4ESg== +X-Gm-Message-State: + ALoCoQngQ53VPER3gS113meSHt7aB5H9knDKtLQ7qrZQCFB84O3Ozesozuu03GIo8IgWKyGQ5H8J +X-Received: by 10.194.62.107 with SMTP id x11mr4831597wjr.49.1411915265394; + Sun, 28 Sep 2014 07:41:05 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw2-58c36c-245.dhcp.inet.fi. + [88.195.108.245]) + by mx.google.com with ESMTPSA id g6sm12706034wjf.13.2014.09.28.07.41.04 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sun, 28 Sep 2014 07:41:04 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/3] cli/insert: add fail path to add_file_to_database +Date: Sun, 28 Sep 2014 17:40:57 +0300 +Message-Id: + <7b0d3b0e7357e2dd87ca48a559e6b7f661c1374c.1411914914.git.jani@nikula.org> +X-Mailer: git-send-email 2.1.0 +In-Reply-To: +References: +In-Reply-To: +References: +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: Sun, 28 Sep 2014 14:41:11 -0000 + +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 5ef6e66d86e2..0ea438015dbe 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