--- /dev/null
+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 60EB1431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 02:15:51 -0700 (PDT)\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 H5-9Ih9dea3B for <notmuch@notmuchmail.org>;\r
+ Sat, 21 Apr 2012 02:15:50 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+ [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id A9B58431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 02:15:50 -0700 (PDT)\r
+Received: by wibhm17 with SMTP id hm17so1500624wib.2\r
+ for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 02:15:49 -0700 (PDT)\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=cMEMkQl84hgqEEbGER3D0fDqDiVeLs34d5ODtVbxQEg=;\r
+ b=H5LmwuR31VkR/1b2a4FW2nM0QMNI/DW5uvMFUJbBIPTWyweAnPiL89jFvfRnQe4TOy\r
+ XEoLWVj3AtpZhjxC7+OGVGU2a1CnU4Uun8IgYl3r3n/IbkxIwsX2I9M4YW8aVmcmhrOP\r
+ gzLQYUn2OfbQVlqqRzt60JOqSbsXr4Xt+YzQb0rLJm7eCH2evdVHwSYwGqQWdvPOZnY9\r
+ BXT5OdFoTy1EOtS+e0NKOf/CGnwLG4L7iK7/3c42OSLnPSuHiSsjxkPFX0fW4LLwqEA1\r
+ tky1VMB53DkWHaCq0iKzj6SFbdZu7391AVPeyUmzpnG7ta38eo0Cq0f2jWCcAer0z+xj\r
+ YhUw==\r
+Received: by 10.216.133.93 with SMTP id p71mr5848232wei.10.1334999749293;\r
+ Sat, 21 Apr 2012 02:15:49 -0700 (PDT)\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
+ fz9sm4076829wib.3.2012.04.21.02.15.48 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 21 Apr 2012 02:15:48 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 1/2] cli: make --entire-thread=false work for format=json.\r
+Date: Sat, 21 Apr 2012 10:15:49 +0100\r
+Message-Id: <1334999750-21811-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1334999750-21811-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1334999750-21811-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: Sat, 21 Apr 2012 09:15:51 -0000\r
+\r
+The --entire-thread option in notmuch-show.c defaults to true when\r
+format=json. Previously there was no way to turn this off. This patch\r
+makes it respect --entire-thread=false.\r
+\r
+The one subtlety is that we initialise a notmuch_bool_t to -1 to\r
+indicate that the option parsing has not set it. This allows the code\r
+to distinguish between the option being omitted from the command line,\r
+and the option being set to false on the command line.\r
+\r
+Finally, all formats except Json can output empty messages for non\r
+entire-thread, but in Json format we need to output {} to keep the\r
+other elements (e.g. the replies to this message) in the correct\r
+place.\r
+---\r
+ notmuch-show.c | 34 +++++++++++++++++++++++++++++-----\r
+ 1 files changed, 29 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index da4a797..327c263 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -800,6 +800,16 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,\r
+ }\r
+ \r
+ static notmuch_status_t\r
++show_null_message (const notmuch_show_format_t *format)\r
++{\r
++ /* For all formats except json an empty message output is valid;\r
++ * for json we need the braces.*/\r
++ if (format == &format_json)\r
++ printf ("{}");\r
++ return NOTMUCH_STATUS_SUCCESS;\r
++}\r
++\r
++static notmuch_status_t\r
+ show_message (void *ctx,\r
+ const notmuch_show_format_t *format,\r
+ notmuch_message_t *message,\r
+@@ -862,11 +872,13 @@ show_messages (void *ctx,\r
+ if (status && !res)\r
+ res = status;\r
+ next_indent = indent + 1;\r
+-\r
+- if (!status && format->message_set_sep)\r
+- fputs (format->message_set_sep, stdout);\r
++ } else {\r
++ status = show_null_message (format);\r
+ }\r
+ \r
++ if (!status && format->message_set_sep)\r
++ fputs (format->message_set_sep, stdout);\r
++\r
+ status = show_messages (ctx,\r
+ format,\r
+ notmuch_message_get_replies (message),\r
+@@ -984,7 +996,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ char *query_string;\r
+ int opt_index, ret;\r
+ const notmuch_show_format_t *format = &format_text;\r
+- notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };\r
++\r
++ /* We abuse the notmuch_bool_t variable params.entire-thread by\r
++ * setting it to -1 to denote that the command line parsing has\r
++ * not set it. We ensure it is set to TRUE or FALSE before passing\r
++ * it to any other function.*/\r
++ notmuch_show_params_t params = { .part = -1, .entire_thread = -1 };\r
++\r
+ int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+ notmuch_bool_t verify = FALSE;\r
+ int exclude = EXCLUDE_TRUE;\r
+@@ -1024,7 +1042,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
++ /* JSON defaults to entire-thread TRUE */\r
++ if (params.entire_thread == -1)\r
++ params.entire_thread = TRUE;\r
+ break;\r
+ case NOTMUCH_FORMAT_TEXT:\r
+ format = &format_text;\r
+@@ -1046,6 +1066,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ params.raw = TRUE;\r
+ break;\r
+ }\r
++ /* Default is entire-thread = FALSE except for format=json which\r
++ * is dealt with above. */\r
++ if (params.entire_thread == -1)\r
++ params.entire_thread = FALSE;\r
+ \r
+ if (params.decrypt || verify) {\r
+ #ifdef GMIME_ATLEAST_26\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff