--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 F10C6431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Sep 2012 01:52:01 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 W1MW3rLfxk1A for <notmuch@notmuchmail.org>;\r
+ Mon, 10 Sep 2012 01:52:00 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 4920E431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Sep 2012 01:52:00 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id C867210036F;\r
+ Mon, 10 Sep 2012 11:52:05 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Michal Nazarewicz <mpn@google.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCHv3] notmuch-show: include Bcc header in json output\r
+In-Reply-To:\r
+ <7b1848a5828820912e3f7b960528b0dbc6a8b361.1347258748.git.mina86@mina86.com>\r
+References: <m2zk50oiq6.fsf@guru.guru-group.fi>\r
+ <7b1848a5828820912e3f7b960528b0dbc6a8b361.1347258748.git.mina86@mina86.com>\r
+User-Agent: Notmuch/0.13.2+162~ged38330 (http://notmuchmail.org) Emacs/24.2.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 10 Sep 2012 11:52:05 +0300\r
+Message-ID: <m2d31u6z0q.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Mon, 10 Sep 2012 08:52:02 -0000\r
+\r
+On Mon, Sep 10 2012, Michal Nazarewicz <mpn@google.com> wrote:\r
+\r
+> From: Michal Nazarewicz <mina86@mina86.com>\r
+>\r
+> With this change, emacs users can use notmuch-message-headers\r
+> variable to configure notmuch-show display Bcc header.\r
+> ---\r
+\r
+Thanks, that explains (also why my attempts to show Message-ID has failed ;)\r
+\r
+I applied the patch, run tests (which pass) and tested the feature --\r
+The Bcc field is indeed shown.\r
+\r
+The only annoyance for me is that in the file I picked to test had:\r
+\r
+BCC: user1@host.tld, user2@host.tld,\r
+ user3@host.tld, user4@host.tld\r
+\r
+notmuch displayed this content as\r
+\r
+ Bcc: user1@host.tld, user2@host.tld,\r
+user3@host.tld, user4@host.tld\r
+\r
+I think this should be "fixed" (somehow (*)) in the future, but this\r
+should not hold this patch.\r
+\r
++1\r
+\r
+Tomi\r
+\r
+(*) How that is done is another issue, should the cli or emacs do it,\r
+(i.e. which interface modifies spacing information) and should this be done\r
+generally to all headers. Is the solution to change all whitespace to one\r
+space or indent subsequent on screen...\r
+\r
+> notmuch-show.c | 7 +++++++\r
+> test/json | 8 ++++----\r
+> test/test-lib.sh | 5 +++++\r
+> 3 files changed, 16 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/notmuch-show.c b/notmuch-show.c\r
+> index 3556293..0b7abf1 100644\r
+> --- a/notmuch-show.c\r
+> +++ b/notmuch-show.c\r
+> @@ -233,6 +233,13 @@ format_headers_json (sprinter_t *sp, GMimeMessage *message,\r
+> sp->string (sp, recipients_string);\r
+> }\r
+> \r
+> + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);\r
+> + recipients_string = internet_address_list_to_string (recipients, 0);\r
+> + if (recipients_string) {\r
+> + sp->map_key (sp, "Bcc");\r
+> + sp->string (sp, recipients_string);\r
+> + }\r
+> +\r
+> if (reply) {\r
+> sp->map_key (sp, "In-reply-to");\r
+> sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to"));\r
+> diff --git a/test/json b/test/json\r
+> index ac8fa8e..40d0ba3 100755\r
+> --- a/test/json\r
+> +++ b/test/json\r
+> @@ -3,18 +3,18 @@ test_description="--format=json output"\r
+> . ./test-lib.sh\r
+> \r
+> test_begin_subtest "Show message: json"\r
+> -add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-show-message\""\r
+> +add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[bcc]=\"test_suite+bcc@notmuchmail.org\"" "[body]=\"json-show-message\""\r
+> output=$(notmuch show --format=json "json-show-message")\r
+> -test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+> +test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+> \r
+> # This should be the same output as above.\r
+> test_begin_subtest "Show message: json --body=true"\r
+> output=$(notmuch show --format=json --body=true "json-show-message")\r
+> -test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+> +test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\",\"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+> \r
+> test_begin_subtest "Show message: json --body=false"\r
+> output=$(notmuch show --format=json --body=false "json-show-message")\r
+> -test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]"\r
+> +test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\",\"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]"\r
+> \r
+> test_begin_subtest "Search message: json"\r
+> add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""\r
+> diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> index f34b1fb..e14203d 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -350,6 +350,11 @@ ${additional_headers}"\r
+> ${additional_headers}"\r
+> fi\r
+> \r
+> + if [ ! -z "${template[bcc]}" ]; then\r
+> + additional_headers="Bcc: ${template[bcc]}\r
+> +${additional_headers}"\r
+> + fi\r
+> +\r
+> if [ ! -z "${template[references]}" ]; then\r
+> additional_headers="References: ${template[references]}\r
+> ${additional_headers}"\r
+> -- \r
+> 1.7.7.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff