[PATCH 09/18] insert: apply default tags to new message

diff --git a/ea/d0ae57680b78f67493962ea9482f4d2a826a27 b/ea/d0ae57680b78f67493962ea9482f4d2a826a27
new file mode 100644 (file)
index 0000000..43a7849
--- /dev/null
+++ b/ea/d0ae57680b78f67493962ea9482f4d2a826a27
@@ -0,0 +1,149 @@
+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 338E9431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:04 -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 akMMZ0lKHMGL for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jul 2012 06:44:03 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5E8BE431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:03 -0700 (PDT)\r
+Received: by mail-pb0-f53.google.com with SMTP id rr13so1767731pbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:03 -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=bNNuP4P8lhanPTTFOlvGDB5KvUQsfrN03C6SvE3x15k=;\r
+       b=lppGPsH5x16fzrRM5DgGjJyZ2pQ5TGbWuQ6B0kIZJPJ3mtFVpvPmubUGbs1DsDoepO\r
+       uSjpghVruxsYiWvfgfzqbBxVVqISPTWfpvwqpzIkQTDS90dUUgZRVBHaU7F9rSDUs5gb\r
+       cBqDiN8GidygzizQCVRptrBqcdY//YSVW8Zm1YVExQ34oaUZ/pQaLt2OO92g1s6c3fVP\r
+       urxj0TuPTRHcfNjB557wRZavprIbEoQJF6m42GvQw/TCrBwz/2xuIexBwF6VgxDyAolH\r
+       M6+IK8imH5X2ucaYKYUdjKswC+lK0l17AerenhGUkMfJQcDec28DXPOwfA7INBScAkGo\r
+       jLyg==\r
+Received: by 10.68.220.163 with SMTP id px3mr54578208pbc.167.1343223843181;\r
+       Wed, 25 Jul 2012 06:44:03 -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 wi6sm14414134pbc.35.2012.07.25.06.44.00\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jul 2012 06:44:02 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 09/18] insert: apply default tags to new message\r
+Date: Wed, 25 Jul 2012 23:42:38 +1000\r
+Message-Id: <1343223767-9812-9-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:44:04 -0000\r
+\r
+Apply the new.tags to messages added by 'insert'.  This mirrors the\r
+behaviour if the message were delivered by a separate tool followed by\r
+'notmuch new'.\r
+---\r
+ notmuch-insert.c |   21 +++++++++++++++++----\r
+ 1 files changed, 17 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index ee51a87..4fb3ea3 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -145,10 +145,12 @@ 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
++save_database (notmuch_database_t *notmuch, const char *path,\r
++             const char **new_tags)\r
+ {\r
+     notmuch_message_t *message;\r
+     notmuch_status_t status;\r
++    int i;\r
+ \r
+     status = notmuch_database_add_message (notmuch, path, &message);\r
+     switch (status) {\r
+@@ -173,6 +175,14 @@ save_database (notmuch_database_t *notmuch, const char *path)\r
+       return FALSE;\r
+     }\r
+ \r
++    notmuch_message_freeze (message);\r
++\r
++    for (i = 0; new_tags[i]; i++) {\r
++      notmuch_message_add_tag (message, new_tags[i]);\r
++    }\r
++\r
++    notmuch_message_thaw (message);\r
++\r
+     notmuch_message_tags_to_maildir_flags (message);\r
+ \r
+     notmuch_message_destroy (message);\r
+@@ -182,7 +192,7 @@ save_database (notmuch_database_t *notmuch, const char *path)\r
+ \r
+ static notmuch_bool_t\r
+ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+-              const char *dir)\r
++              const char *dir, const char **new_tags)\r
+ {\r
+     char *tmppath;\r
+     char *newpath;\r
+@@ -207,7 +217,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+       return FALSE;\r
+     }\r
+ \r
+-    ret = save_database (notmuch, newpath);\r
++    ret = save_database (notmuch, newpath, new_tags);\r
+ \r
+     if (!ret) {\r
+       /* XXX maybe there should be an option to keep the file in maildir? */\r
+@@ -223,6 +233,8 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+     notmuch_config_t *config;\r
+     notmuch_database_t *notmuch;\r
+     const char *db_path;\r
++    const char **new_tags;\r
++    size_t new_tags_length;\r
+     const char *folder = NULL;\r
+     char *maildir;\r
+     int opt_index;\r
+@@ -246,6 +258,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+       return 1;\r
+ \r
+     db_path = notmuch_config_get_database_path (config);\r
++    new_tags = notmuch_config_get_new_tags (config, &new_tags_length);\r
+ \r
+     if (folder != NULL) {\r
+       if (! check_folder_name (folder)) {\r
+@@ -261,7 +274,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+                              NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))\r
+       return 1;\r
+ \r
+-    ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir);\r
++    ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir, new_tags);\r
+ \r
+     notmuch_database_destroy (notmuch);\r
+ \r
+-- \r
+1.7.4.4\r
+\r