[PATCH 06/18] insert: add new message to database

diff --git a/bf/817f46e22e3648b95664b5528344fa9a436249 b/bf/817f46e22e3648b95664b5528344fa9a436249
new file mode 100644 (file)
index 0000000..b5a45a6
--- /dev/null
+++ b/bf/817f46e22e3648b95664b5528344fa9a436249
@@ -0,0 +1,133 @@
+Return-Path: <novalazy@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6F9D7431FD8\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id yE77LJAtnGW4 for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jul 2012 06:43:55 -0700 (PDT)\r
+Received: from mail-yx0-f181.google.com (mail-yx0-f181.google.com\r
+       [209.85.213.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8EFAB431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:45 -0700 (PDT)\r
+Received: by yenl3 with SMTP id l3so889862yen.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:44 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=5gUAsbjGjHAAUr5DeMqRKBb/VKH3tLLghlf8sVfp5uQ=;\r
+       b=cAaYqSyysxg10DY/uS17kHW4r6Y459U0jv8k8ynVK4DNR6xTi8F4CLeNH7DS6UaMyX\r
+       h9qb0QDnYIqkngoJL1u56Cy5+gS4XAac/P1Crmi3FNvqX+mYAnYSPxrY8bWy0tWmWz4O\r
+       8GQt/Q/oWadlRe2/XQBKMqtWrOA6oQ4cocBVQM7jKG9ZdgAtofWTIJI9vXD9W5Iiz9pv\r
+       jGYwcJ80GXMPSq+8oYJsXxjdQ7jeVpaJ5I/Hwm6D56BcLEDw4Ps5wVm5UHyfop2MZoUK\r
+       8XdalU74FX661tSHgcE7tT/wdKBbHD7ss8JB6YTMVNx3YLbiz22uN852AoVj0G3K7eF3\r
+       02uA==\r
+Received: by 10.66.76.170 with SMTP id l10mr12812852paw.57.1343223824578;\r
+       Wed, 25 Jul 2012 06:43:44 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id ng8sm14418478pbc.13.2012.07.25.06.43.41\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jul 2012 06:43:43 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 06/18] insert: add new message to database\r
+Date: Wed, 25 Jul 2012 23:42:35 +1000\r
+Message-Id: <1343223767-9812-6-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 25 Jul 2012 13:43:56 -0000\r
+\r
+Add the new message to the notmuch database, renaming the file to encode\r
+notmuch tags as maildir flags.\r
+---\r
+ notmuch-insert.c |   44 ++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 files changed, 44 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index bab1fed..dd449bc 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -129,6 +129,42 @@ copy_fd_data (int fdin, int fdout)\r
+ }\r
+ \r
+ static notmuch_bool_t\r
++save_database (notmuch_database_t *notmuch, const char *path)\r
++{\r
++    notmuch_message_t *message;\r
++    notmuch_status_t status;\r
++\r
++    status = notmuch_database_add_message (notmuch, path, &message);\r
++    switch (status) {\r
++    case NOTMUCH_STATUS_SUCCESS:\r
++      break;\r
++    case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:\r
++      fprintf (stderr, "Warning: duplicate message.\n");\r
++      break;\r
++    default:\r
++    case NOTMUCH_STATUS_FILE_NOT_EMAIL:\r
++    case NOTMUCH_STATUS_READ_ONLY_DATABASE:\r
++    case NOTMUCH_STATUS_XAPIAN_EXCEPTION:\r
++    case NOTMUCH_STATUS_OUT_OF_MEMORY:\r
++    case NOTMUCH_STATUS_FILE_ERROR:\r
++    case NOTMUCH_STATUS_NULL_POINTER:\r
++    case NOTMUCH_STATUS_TAG_TOO_LONG:\r
++    case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:\r
++    case NOTMUCH_STATUS_UNBALANCED_ATOMIC:\r
++    case NOTMUCH_STATUS_LAST_STATUS:\r
++      fprintf (stderr, "Error: failed to add `%s' to notmuch database: %s\n",\r
++               path, notmuch_status_to_string (status));\r
++      return FALSE;\r
++    }\r
++\r
++    notmuch_message_tags_to_maildir_flags (message);\r
++\r
++    notmuch_message_destroy (message);\r
++\r
++    return TRUE;\r
++}\r
++\r
++static notmuch_bool_t\r
+ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+               const char *dir)\r
+ {\r
+@@ -152,6 +188,14 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+ \r
+     if (!ret) {\r
+       unlink (tmppath);\r
++      return FALSE;\r
++    }\r
++\r
++    ret = save_database (notmuch, newpath);\r
++\r
++    if (!ret) {\r
++      /* XXX maybe there should be an option to keep the file in maildir? */\r
++      unlink (newpath);\r
+     }\r
+ \r
+     return ret;\r
+-- \r
+1.7.4.4\r
+\r