[PATCH v2 08/20] insert: support --folder option

diff --git a/0c/e4e95f82c6a28e118b6bb4eea004b87cea1eab b/0c/e4e95f82c6a28e118b6bb4eea004b87cea1eab
new file mode 100644 (file)
index 0000000..dc97911
--- /dev/null
+++ b/0c/e4e95f82c6a28e118b6bb4eea004b87cea1eab
@@ -0,0 +1,112 @@
+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 89019431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:50 -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 Spwe83tBZSwW for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:17:50 -0800 (PST)\r
+Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com\r
+       [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0B80C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:49 -0800 (PST)\r
+Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:49 -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=2NE0FXGC1i2630ICDz8Yy4v0touNs4MaQ4U3C/nmWT8=;\r
+       b=YkkKI2mSr1s9bD4PLK5tQJb4lwhiY5WdrWbI9P7UWqMlF1aBw3BRZ7fjyU/S1v2PgR\r
+       2VoU8h93Z2oGSfCWq3dDfRlExNEzyGMnNTIeauAnLioyvqcuRbWXYJm3M0GChcrBDV+T\r
+       9q0VseBVs5kyN+FNDjq4EFXfr2AcHtQPJswpx/A7rSNHRoxc3vVl8zuNJ2gXySO7A0/7\r
+       yyo4wWKkE17z1boiXlNxqV5ZGjUtOjfSPmnBYR8sz7QLcpLyhyYqMh/DrC1/TkZWZNru\r
+       vm4jH5rywB+Kosytoiq2cBO16F1yM82Wx6xMWE4n/i99Q7oIGFqQ7AomH7w19UvcPGCI\r
+       blGA==\r
+Received: by 10.68.135.101 with SMTP id pr5mr26127731pbb.140.1353806269801;\r
+       Sat, 24 Nov 2012 17:17:49 -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 mz10sm6225942pbc.37.2012.11.24.17.17.47\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:17:49 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 08/20] insert: support --folder option\r
+Date: Sun, 25 Nov 2012 12:16:34 +1100\r
+Message-Id: <1353806206-29133-9-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:17:50 -0000\r
+\r
+Allow the new message to be inserted into a folder within the Maildir\r
+hierarchy instead of the top-level folder.\r
+---\r
+ notmuch-insert.c | 21 ++++++++++++++++++++-\r
+ 1 file changed, 20 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 020dc29..a50eacc 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -230,16 +230,35 @@ 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 *folder = NULL;\r
+     char *maildir;\r
++    int opt_index;\r
+     notmuch_bool_t ret;\r
+ \r
++    notmuch_opt_desc_t options[] = {\r
++      { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },\r
++      { NOTMUCH_OPT_END, 0, 0, 0, 0 }\r
++    };\r
++\r
++    opt_index = parse_arguments (argc, argv, options, 1);\r
++\r
++    if (opt_index < 0) {\r
++      fprintf (stderr, "Error: bad argument to notmuch insert: %s\n",\r
++               argv[-opt_index]);\r
++      return 1;\r
++    }\r
++\r
+     config = notmuch_config_open (ctx, NULL, NULL);\r
+     if (config == NULL)\r
+       return 1;\r
+ \r
+     db_path = notmuch_config_get_database_path (config);\r
+ \r
+-    maildir = talloc_asprintf (ctx, "%s", db_path);\r
++    if (folder != NULL) {\r
++      maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);\r
++    } else {\r
++      maildir = talloc_asprintf (ctx, "%s", db_path);\r
++    }\r
+     if (! maildir) {\r
+       fprintf (stderr, "Out of memory\n");\r
+       return 1;\r
+-- \r
+1.7.12.1\r
+\r