[PATCH v2 10/20] insert: apply default tags to new message

diff --git a/a2/abae1a46f4942bb5f45b6739a0efeec1039e91 b/a2/abae1a46f4942bb5f45b6739a0efeec1039e91
new file mode 100644 (file)
index 0000000..4bf1110
--- /dev/null
+++ b/a2/abae1a46f4942bb5f45b6739a0efeec1039e91
@@ -0,0 +1,155 @@
+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 CB093431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:01 -0800 (PST)\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 Pu1yIlq9t5Ev for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:18:01 -0800 (PST)\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 40F11431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:01 -0800 (PST)\r
+Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:01 -0800 (PST)\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=ZT9+YIg5cNv68UbIeoNGgafS30PjYKVyTEEFf5LoN2g=;\r
+       b=aeLIJgoXuXuPUeUL8CEFvCCZXUIOn+2WgaOh2Brjn4P3YvwXcHxfvTkODAdkzb1pK2\r
+       HTrquyiz/CGwJRpNAtS0jVQGA6BqIGYMuwLir3gUSoGHPOOlVL2E/c2MWiEky7L025Zv\r
+       3TN3u3bss+V4cXuZIpjciZIXwUApLGaNOn5emLhaSDhWJvqWkqh8aP85vmPlP0B3Fi8l\r
+       4cARU4FTaGvLmG93N/R5fiXcKvxARMv+VXrH/zz06erXKMF/ysKk2rKixBvrzA+Got3G\r
+       bCCfRea0UElVcOKk1BjUp5klV0veL2fsRTKA3dhRIGyh3yiG2/CqAME2ujCYf1a3+t+u\r
+       tXlg==\r
+Received: by 10.68.244.135 with SMTP id xg7mr26289949pbc.87.1353806281013;\r
+       Sat, 24 Nov 2012 17:18:01 -0800 (PST)\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 ot5sm6228075pbb.29.2012.11.24.17.17.58\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:18:00 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 10/20] insert: apply default tags to new message\r
+Date: Sun, 25 Nov 2012 12:16:36 +1100\r
+Message-Id: <1353806206-29133-11-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-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: Sun, 25 Nov 2012 01:18:01 -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 | 25 ++++++++++++++++++++-----\r
+ 1 file changed, 20 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 022f7cd..362da66 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -170,13 +170,15 @@ copy_fd_data (int fdin, int fdout)\r
+     return TRUE;\r
+ }\r
+ \r
+-/* Add the specified message file to the notmuch database.\r
++/* Add the specified message file to the notmuch database, applying tags.\r
+  * The file is renamed to encode notmuch tags as maildir flags. */\r
+ static notmuch_bool_t\r
+-add_file_to_database (notmuch_database_t *notmuch, const char *path)\r
++add_file_to_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
+@@ -201,6 +203,16 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path)\r
+       return FALSE;\r
+     }\r
+ \r
++    notmuch_message_freeze (message);\r
++\r
++    /* Apply the new.tags, as would happen were the message added by\r
++     * 'notmuch new'. */\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
+@@ -210,7 +222,7 @@ add_file_to_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
+@@ -231,7 +243,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+       return FALSE;\r
+     }\r
+ \r
+-    ret = add_file_to_database (notmuch, newpath);\r
++    ret = add_file_to_database (notmuch, newpath, new_tags);\r
+     if (!ret) {\r
+       /* XXX maybe there should be an option to keep the file in maildir? */\r
+       unlink (newpath);\r
+@@ -247,6 +259,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
+@@ -270,6 +284,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
+@@ -289,7 +304,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.12.1\r
+\r