[PATCH v3 10/20] insert: support --folder option

diff --git a/94/b0084a932ab528a7bac476ec2fc4feeb324407 b/94/b0084a932ab528a7bac476ec2fc4feeb324407
new file mode 100644 (file)
index 0000000..22aae0e
--- /dev/null
+++ b/94/b0084a932ab528a7bac476ec2fc4feeb324407
@@ -0,0 +1,115 @@
+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 797F2429E40\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:37 -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 CScjRkvH5tpW for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 16:51:36 -0800 (PST)\r
+Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com\r
+       [209.85.160.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A5255431FD7\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:22 -0800 (PST)\r
+Received: by mail-pb0-f50.google.com with SMTP id wz7so2678828pbc.37\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:21 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=8AfT3+ZwENkxpre4nk7PSAU4onr00rxvhHFAKCUbbQA=;\r
+       b=juN0PNTOr/0ZsUFS9hAKN9f8NJ48F7YpVS8zeufXDRlYJuEAWidV3xX6+UUwuEqcTH\r
+       YFFqKA0jUiSTidDRZidjSDPrHaLJqaiVGtOHkjxcWTwiEL6S8LtImMoxmmNmD6/nE1vM\r
+       c+2G+SmsHnK9UZKXAM/03ylhUWaY1GYNEAdJ0md5Rs/5wTVJdVYfevvGpYbqZ9PRq3sO\r
+       tIZnfBDCm0ESYcOgcBkogQ9Wbd9KR/a6ugYUdungz14vHhsctXgmDcv1I2/9rEjC5JeM\r
+       pmufQ1ei7d8bQX88qXAtPorge0tY2tyq5JPthVhq9RxyAQ/Y8Duu1T7FytFwRBnWrrTB\r
+       2xyA==\r
+X-Received: by 10.66.79.168 with SMTP id k8mr36445007pax.22.1358643081774;\r
+       Sat, 19 Jan 2013 16:51:21 -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 oi3sm5811448pbb.1.2013.01.19.16.51.19\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 19 Jan 2013 16:51:21 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 10/20] insert: support --folder option\r
+Date: Sun, 20 Jan 2013 11:49:54 +1100\r
+Message-Id: <1358643004-14522-11-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\r
+References: <1358643004-14522-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, 20 Jan 2013 00:51:38 -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 | 22 ++++++++++++++++++++--\r
+ 1 file changed, 20 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index b0ac174..ba8cf5a 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -236,11 +236,25 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+     size_t new_tags_length;\r
+     tag_op_list_t *tag_ops;\r
+     char *query_string = NULL;\r
++    const char *folder = NULL;\r
+     char *maildir;\r
+-    int opt_index = 1;\r
++    int opt_index;\r
+     unsigned int i;\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
+@@ -267,7 +281,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+       return 1;\r
+     }\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