[RFC PATCH v2 1/3] cli: notmuch-show changes to support pick

diff --git a/79/c8963f0b2411297fc4e464c81c3a99c2b31e44 b/79/c8963f0b2411297fc4e464c81c3a99c2b31e44
new file mode 100644 (file)
index 0000000..7f1392d
--- /dev/null
+++ b/79/c8963f0b2411297fc4e464c81c3a99c2b31e44
@@ -0,0 +1,250 @@
+Return-Path: <markwalters1009@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 C4580421176\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 10:49:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 hem2A18O-8EC for <notmuch@notmuchmail.org>;\r
+       Sun, 12 Feb 2012 10:49:01 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9DB50421174\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 10:49:00 -0800 (PST)\r
+Received: by mail-we0-f181.google.com with SMTP id p13so3496132wer.26\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 10:49:00 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=Gw+MTKJh76ZaxG2KE28nPs2RsTQV2hOnc94mLutAvYw=;\r
+       b=XKa+i/FLAzW7W77g9jv4lXr9b9XwtA7+FjLu6OJZI2+27P6lbjv1xwS89AORKD7aHQ\r
+       lecRCrno4SZCLyRpwYLZ4MPSTK1IpJuuNv+vvQifvVRzXo3UQ4r/fa0Mo4fClSPFqzin\r
+       wyrYAh5/PtKgNXgbTmKyYnIH37U4XfipgHrcg=\r
+Received: by 10.180.101.165 with SMTP id fh5mr20092094wib.10.1329072540340;\r
+       Sun, 12 Feb 2012 10:49:00 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ q7sm16745258wix.5.2012.02.12.10.48.58 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 12 Feb 2012 10:48:59 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH v2 1/3] cli: notmuch-show changes to support pick\r
+Date: Sun, 12 Feb 2012 18:49:37 +0000\r
+Message-Id: <1329072579-27340-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1329072579-27340-1-git-send-email-markwalters1009@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, 12 Feb 2012 18:49:04 -0000\r
+\r
+---\r
+ notmuch-client.h |    9 +++++-\r
+ notmuch-show.c   |   90 ++++++++++++++++++++++++++++++++++++++++++++++++------\r
+ 2 files changed, 88 insertions(+), 11 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 60828aa..b4dc7bf 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -97,10 +97,17 @@ typedef struct notmuch_show_format {\r
+     const char *message_set_end;\r
+ } notmuch_show_format_t;\r
+ \r
++enum {\r
++    NOTMUCH_SHOW_THREAD_MATCH,\r
++    NOTMUCH_SHOW_THREAD_ENTIRE,\r
++    NOTMUCH_SHOW_THREAD_NONE\r
++};\r
++\r
+ typedef struct notmuch_show_params {\r
+-    notmuch_bool_t entire_thread;\r
++    int entire_thread;\r
+     notmuch_bool_t raw;\r
+     int part;\r
++    int headers_only;\r
+ #ifdef GMIME_ATLEAST_26\r
+     GMimeCryptoContext* cryptoctx;\r
+ #else\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index d930f94..ec2b078 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -841,7 +841,7 @@ show_message (void *ctx,\r
+       fputs (format->body_start, stdout);\r
+     }\r
+ \r
+-    if (format->part_content)\r
++    if (format->part_content && !params->headers_only)\r
+       show_message_body (message, format, params);\r
+ \r
+     if (params->part <= 0) {\r
+@@ -888,11 +888,16 @@ show_messages (void *ctx,\r
+           fputs (format->message_set_sep, stdout);\r
+       }\r
+ \r
+-      show_messages (ctx,\r
+-                     format,\r
+-                     notmuch_message_get_replies (message),\r
+-                     next_indent,\r
+-                     params);\r
++      if (params->entire_thread != NOTMUCH_SHOW_THREAD_NONE)\r
++          show_messages (ctx,\r
++                         format,\r
++                         notmuch_message_get_replies (message),\r
++                         next_indent,\r
++                         params);\r
++      else {\r
++          fputs (format->message_set_start, stdout);\r
++          fputs (format->message_set_end, stdout);\r
++      }\r
+ \r
+       notmuch_message_destroy (message);\r
+ \r
+@@ -902,6 +907,50 @@ show_messages (void *ctx,\r
+     fputs (format->message_set_end, stdout);\r
+ }\r
+ \r
++static int\r
++do_show_messages (void *ctx,\r
++                notmuch_query_t *query,\r
++                const notmuch_show_format_t *format,\r
++                notmuch_show_params_t *params)\r
++{\r
++    notmuch_messages_t *messages;\r
++    notmuch_message_t *message;\r
++    int first_set = 1;\r
++\r
++    fputs (format->message_set_start, stdout);\r
++    messages = notmuch_query_search_messages (query);\r
++\r
++    for (;\r
++       notmuch_messages_valid (messages);\r
++       notmuch_messages_move_to_next (messages))\r
++    {\r
++      if (!first_set)\r
++          fputs (format->message_set_sep, stdout);\r
++      first_set = 0;\r
++\r
++      fputs (format->message_set_start, stdout);\r
++      fputs (format->message_set_start, stdout);\r
++\r
++      message = notmuch_messages_get (messages);\r
++      notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);\r
++      show_message (ctx, format, message, 0, params);\r
++\r
++      fputs (format->message_set_sep, stdout);\r
++\r
++      fputs (format->message_set_start, stdout);\r
++      fputs (format->message_set_end, stdout);\r
++\r
++\r
++      notmuch_message_destroy (message);\r
++\r
++      fputs (format->message_set_end, stdout);\r
++      fputs (format->message_set_end, stdout);\r
++    }\r
++\r
++    fputs (format->message_set_end, stdout);\r
++    return 0;\r
++}\r
++\r
+ /* Formatted output of single message */\r
+ static int\r
+ do_show_single (void *ctx,\r
+@@ -1029,11 +1078,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     notmuch_database_t *notmuch;\r
+     notmuch_query_t *query;\r
+     char *query_string;\r
+-    int opt_index, ret;\r
++    int opt_index, ret, entire_thread;\r
++    notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;\r
+     const notmuch_show_format_t *format = &format_text;\r
+     notmuch_show_params_t params = { .part = -1 };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
++    notmuch_bool_t headers_only = FALSE;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+@@ -1042,10 +1093,19 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+                                 { "mbox", NOTMUCH_FORMAT_MBOX },\r
+                                 { "raw", NOTMUCH_FORMAT_RAW },\r
+                                 { 0, 0 } } },\r
++      { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',\r
++        (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },\r
++                                { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },\r
++                                { 0, 0 } } },\r
+       { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\r
+-      { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },\r
++      { NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't',\r
++        (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },\r
++                                { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },\r
++                                { "none", NOTMUCH_SHOW_THREAD_NONE },\r
++                                { 0, 0 } } },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -1055,6 +1115,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
++    params.entire_thread = entire_thread;\r
++    params.headers_only = headers_only;\r
++\r
+     if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) {\r
+       /* if part was requested and format was not specified, use format=raw */\r
+       if (params.part >= 0)\r
+@@ -1066,7 +1129,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     switch (format_sel) {\r
+     case NOTMUCH_FORMAT_JSON:\r
+       format = &format_json;\r
+-      params.entire_thread = TRUE;\r
++      if (!params.entire_thread) params.entire_thread = NOTMUCH_SHOW_THREAD_ENTIRE;\r
++      //      params.entire_thread = 1;\r
++\r
+       break;\r
+     case NOTMUCH_FORMAT_TEXT:\r
+       format = &format_text;\r
+@@ -1133,10 +1198,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
++    notmuch_query_set_sort (query, sort);\r
++\r
+     if (params.part >= 0)\r
+       ret = do_show_single (ctx, query, format, &params);\r
+     else\r
+-      ret = do_show (ctx, query, format, &params);\r
++      if (params.entire_thread == NOTMUCH_SHOW_THREAD_NONE)\r
++          ret = do_show_messages (ctx, query, format, &params);\r
++      else\r
++          ret = do_show (ctx, query, format, &params);\r
+ \r
+     notmuch_query_destroy (query);\r
+     notmuch_database_close (notmuch);\r
+-- \r
+1.7.2.3\r
+\r