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 B7C80431FC2
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:56 -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 9S8HN-i69rmc for <notmuch@notmuchmail.org>;
\r
17 Wed, 25 Jul 2012 06:43:56 -0700 (PDT)
\r
18 Received: from mail-yx0-f181.google.com (mail-yx0-f181.google.com
\r
19 [209.85.213.181]) (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 3928D431FD7
\r
22 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:51 -0700 (PDT)
\r
23 Received: by mail-yx0-f181.google.com with SMTP id l3so889862yen.26
\r
24 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:51 -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=osf7d7Be8NNdKdTD1f1xrB/W1Jml6USeT1LOsxw89QU=;
\r
28 b=SxiqiGZVQId2VhWOlsRIiNCCVxJbzWLRur8PLV5+ZzFp+bMgOefW22+ILoOoDhyTZL
\r
29 e+neVwxYJ01XKEF0xs+IraHULIpO6/BE3oubAXQ6sByCHPBoFzaGJ8kZlsw9bx5wSLmU
\r
30 anTw+8GHqw/KikOX+Ni6Yd63Y5WOnS04/yg/18lV90pqj/S7r63KLS0gyGnevDJDur1w
\r
31 zT2qwdbysj+9qVbBRqFcvSPwfjEkwU87GDaVKPxVcWCn/u/O9OuC/d1z1qW9xAkw7n7m
\r
32 xvVxzbcOTPcOm+0+fAe8vlcANxOYZ5rxd7JprWrsdHQggMNYuPt+JkSdfR1m8+i5BlTX
\r
34 Received: by 10.66.89.170 with SMTP id bp10mr12801098pab.12.1343223830696;
\r
35 Wed, 25 Jul 2012 06:43:50 -0700 (PDT)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id ka5sm14412987pbb.37.2012.07.25.06.43.48
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Wed, 25 Jul 2012 06:43:49 -0700 (PDT)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 07/18] insert: add --folder option
\r
44 Date: Wed, 25 Jul 2012 23:42:36 +1000
\r
45 Message-Id: <1343223767-9812-7-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:43:57 -0000
\r
63 Allow the new message to be inserted into a folder within the Maildir
\r
64 hierarchy instead of the top-level folder.
\r
66 notmuch-insert.c | 21 ++++++++++++++++++++-
\r
67 1 files changed, 20 insertions(+), 1 deletions(-)
\r
69 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
70 index dd449bc..6398618 100644
\r
71 --- a/notmuch-insert.c
\r
72 +++ b/notmuch-insert.c
\r
73 @@ -207,16 +207,35 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
74 notmuch_config_t *config;
\r
75 notmuch_database_t *notmuch;
\r
76 const char *db_path;
\r
77 + const char *folder = NULL;
\r
82 + notmuch_opt_desc_t options[] = {
\r
83 + { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
\r
84 + { NOTMUCH_OPT_END, 0, 0, 0, 0 }
\r
87 + opt_index = parse_arguments (argc, argv, options, 1);
\r
89 + if (opt_index < 0) {
\r
90 + fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",
\r
91 + argv[-opt_index]);
\r
95 config = notmuch_config_open (ctx, NULL, NULL);
\r
99 db_path = notmuch_config_get_database_path (config);
\r
101 - maildir = talloc_asprintf (ctx, "%s", db_path);
\r
102 + if (folder != NULL) {
\r
103 + maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);
\r
105 + maildir = talloc_asprintf (ctx, "%s", db_path);
\r
108 if (notmuch_database_open (notmuch_config_get_database_path (config),
\r
109 NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much))
\r