1 Return-Path: <novalazy@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id CB093431FB6
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:01 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id Pu1yIlq9t5Ev for <notmuch@notmuchmail.org>;
\r
17 Sat, 24 Nov 2012 17:18:01 -0800 (PST)
\r
18 Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com
\r
19 [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 40F11431FAE
\r
22 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:01 -0800 (PST)
\r
23 Received: by mail-pb0-f53.google.com with SMTP id jt11so7944513pbb.26
\r
24 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:01 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=ZT9+YIg5cNv68UbIeoNGgafS30PjYKVyTEEFf5LoN2g=;
\r
28 b=aeLIJgoXuXuPUeUL8CEFvCCZXUIOn+2WgaOh2Brjn4P3YvwXcHxfvTkODAdkzb1pK2
\r
29 HTrquyiz/CGwJRpNAtS0jVQGA6BqIGYMuwLir3gUSoGHPOOlVL2E/c2MWiEky7L025Zv
\r
30 3TN3u3bss+V4cXuZIpjciZIXwUApLGaNOn5emLhaSDhWJvqWkqh8aP85vmPlP0B3Fi8l
\r
31 4cARU4FTaGvLmG93N/R5fiXcKvxARMv+VXrH/zz06erXKMF/ysKk2rKixBvrzA+Got3G
\r
32 bCCfRea0UElVcOKk1BjUp5klV0veL2fsRTKA3dhRIGyh3yiG2/CqAME2ujCYf1a3+t+u
\r
34 Received: by 10.68.244.135 with SMTP id xg7mr26289949pbc.87.1353806281013;
\r
35 Sat, 24 Nov 2012 17:18:01 -0800 (PST)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id ot5sm6228075pbb.29.2012.11.24.17.17.58
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 24 Nov 2012 17:18:00 -0800 (PST)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v2 10/20] insert: apply default tags to new message
\r
44 Date: Sun, 25 Nov 2012 12:16:36 +1100
\r
45 Message-Id: <1353806206-29133-11-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.12.1
\r
47 In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1353806206-29133-1-git-send-email-novalazy@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sun, 25 Nov 2012 01:18:01 -0000
\r
63 Apply the new.tags to messages added by 'insert'. This mirrors the
\r
64 behaviour if the message were delivered by a separate tool followed by
\r
67 notmuch-insert.c | 25 ++++++++++++++++++++-----
\r
68 1 file changed, 20 insertions(+), 5 deletions(-)
\r
70 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
71 index 022f7cd..362da66 100644
\r
72 --- a/notmuch-insert.c
\r
73 +++ b/notmuch-insert.c
\r
74 @@ -170,13 +170,15 @@ copy_fd_data (int fdin, int fdout)
\r
78 -/* Add the specified message file to the notmuch database.
\r
79 +/* Add the specified message file to the notmuch database, applying tags.
\r
80 * The file is renamed to encode notmuch tags as maildir flags. */
\r
81 static notmuch_bool_t
\r
82 -add_file_to_database (notmuch_database_t *notmuch, const char *path)
\r
83 +add_file_to_database (notmuch_database_t *notmuch, const char *path,
\r
84 + const char **new_tags)
\r
86 notmuch_message_t *message;
\r
87 notmuch_status_t status;
\r
90 status = notmuch_database_add_message (notmuch, path, &message);
\r
92 @@ -201,6 +203,16 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path)
\r
96 + notmuch_message_freeze (message);
\r
98 + /* Apply the new.tags, as would happen were the message added by
\r
99 + * 'notmuch new'. */
\r
100 + for (i = 0; new_tags[i]; i++) {
\r
101 + notmuch_message_add_tag (message, new_tags[i]);
\r
104 + notmuch_message_thaw (message);
\r
106 notmuch_message_tags_to_maildir_flags (message);
\r
108 notmuch_message_destroy (message);
\r
109 @@ -210,7 +222,7 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path)
\r
111 static notmuch_bool_t
\r
112 insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
114 + const char *dir, const char **new_tags)
\r
118 @@ -231,7 +243,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
122 - ret = add_file_to_database (notmuch, newpath);
\r
123 + ret = add_file_to_database (notmuch, newpath, new_tags);
\r
125 /* XXX maybe there should be an option to keep the file in maildir? */
\r
127 @@ -247,6 +259,8 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
128 notmuch_config_t *config;
\r
129 notmuch_database_t *notmuch;
\r
130 const char *db_path;
\r
131 + const char **new_tags;
\r
132 + size_t new_tags_length;
\r
133 const char *folder = NULL;
\r
136 @@ -270,6 +284,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
139 db_path = notmuch_config_get_database_path (config);
\r
140 + new_tags = notmuch_config_get_new_tags (config, &new_tags_length);
\r
142 if (folder != NULL) {
\r
143 if (! check_folder_name (folder)) {
\r
144 @@ -289,7 +304,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
145 NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
\r
148 - ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir);
\r
149 + ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir, new_tags);
\r
151 notmuch_database_destroy (notmuch);
\r