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 338E9431FC2
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:04 -0700 (PDT)
\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 akMMZ0lKHMGL for <notmuch@notmuchmail.org>;
\r
17 Wed, 25 Jul 2012 06:44:03 -0700 (PDT)
\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 5E8BE431FAE
\r
22 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:03 -0700 (PDT)
\r
23 Received: by mail-pb0-f53.google.com with SMTP id rr13so1767731pbb.26
\r
24 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:44:03 -0700 (PDT)
\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=bNNuP4P8lhanPTTFOlvGDB5KvUQsfrN03C6SvE3x15k=;
\r
28 b=lppGPsH5x16fzrRM5DgGjJyZ2pQ5TGbWuQ6B0kIZJPJ3mtFVpvPmubUGbs1DsDoepO
\r
29 uSjpghVruxsYiWvfgfzqbBxVVqISPTWfpvwqpzIkQTDS90dUUgZRVBHaU7F9rSDUs5gb
\r
30 cBqDiN8GidygzizQCVRptrBqcdY//YSVW8Zm1YVExQ34oaUZ/pQaLt2OO92g1s6c3fVP
\r
31 urxj0TuPTRHcfNjB557wRZavprIbEoQJF6m42GvQw/TCrBwz/2xuIexBwF6VgxDyAolH
\r
32 M6+IK8imH5X2ucaYKYUdjKswC+lK0l17AerenhGUkMfJQcDec28DXPOwfA7INBScAkGo
\r
34 Received: by 10.68.220.163 with SMTP id px3mr54578208pbc.167.1343223843181;
\r
35 Wed, 25 Jul 2012 06:44:03 -0700 (PDT)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id wi6sm14414134pbc.35.2012.07.25.06.44.00
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Wed, 25 Jul 2012 06:44:02 -0700 (PDT)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 09/18] insert: apply default tags to new message
\r
44 Date: Wed, 25 Jul 2012 23:42:38 +1000
\r
45 Message-Id: <1343223767-9812-9-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.4.4
\r
47 In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1343223767-9812-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: Wed, 25 Jul 2012 13:44:04 -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 | 21 +++++++++++++++++----
\r
68 1 files changed, 17 insertions(+), 4 deletions(-)
\r
70 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
71 index ee51a87..4fb3ea3 100644
\r
72 --- a/notmuch-insert.c
\r
73 +++ b/notmuch-insert.c
\r
74 @@ -145,10 +145,12 @@ copy_fd_data (int fdin, int fdout)
\r
77 static notmuch_bool_t
\r
78 -save_database (notmuch_database_t *notmuch, const char *path)
\r
79 +save_database (notmuch_database_t *notmuch, const char *path,
\r
80 + const char **new_tags)
\r
82 notmuch_message_t *message;
\r
83 notmuch_status_t status;
\r
86 status = notmuch_database_add_message (notmuch, path, &message);
\r
88 @@ -173,6 +175,14 @@ save_database (notmuch_database_t *notmuch, const char *path)
\r
92 + notmuch_message_freeze (message);
\r
94 + for (i = 0; new_tags[i]; i++) {
\r
95 + notmuch_message_add_tag (message, new_tags[i]);
\r
98 + notmuch_message_thaw (message);
\r
100 notmuch_message_tags_to_maildir_flags (message);
\r
102 notmuch_message_destroy (message);
\r
103 @@ -182,7 +192,7 @@ save_database (notmuch_database_t *notmuch, const char *path)
\r
105 static notmuch_bool_t
\r
106 insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
108 + const char *dir, const char **new_tags)
\r
112 @@ -207,7 +217,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,
\r
116 - ret = save_database (notmuch, newpath);
\r
117 + ret = save_database (notmuch, newpath, new_tags);
\r
120 /* XXX maybe there should be an option to keep the file in maildir? */
\r
121 @@ -223,6 +233,8 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
122 notmuch_config_t *config;
\r
123 notmuch_database_t *notmuch;
\r
124 const char *db_path;
\r
125 + const char **new_tags;
\r
126 + size_t new_tags_length;
\r
127 const char *folder = NULL;
\r
130 @@ -246,6 +258,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
133 db_path = notmuch_config_get_database_path (config);
\r
134 + new_tags = notmuch_config_get_new_tags (config, &new_tags_length);
\r
136 if (folder != NULL) {
\r
137 if (! check_folder_name (folder)) {
\r
138 @@ -261,7 +274,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
139 NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
\r
142 - ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir);
\r
143 + ret = insert_message (ctx, notmuch, STDIN_FILENO, maildir, new_tags);
\r
145 notmuch_database_destroy (notmuch);
\r