This paves the way for emitting protected headers after verification
and decryption, because it means that the headers will only be emitted
after the body has been parsed.
---
notmuch-show.c | 6 +++---
test/T170-sexp.sh | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index fea99bff..4e918461 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -607,9 +607,6 @@ format_part_sprinter (const void *ctx, sprinter_t *sp,
mime_node_t *node,
sp->begin_map (sp);
format_message_sprinter (sp, node->envelope_file);
- sp->map_key (sp, "headers");
- format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false);
-
if (output_body) {
sp->map_key (sp, "body");
sp->begin_list (sp);
@@ -643,6 +640,9 @@ format_part_sprinter (const void *ctx, sprinter_t *sp,
mime_node_t *node,
sp->end (sp);
}
+ sp->map_key (sp, "headers");
+ format_headers_sprinter (sp, GMIME_MESSAGE (node->part), false);
+
sp->end (sp);
return;
}
diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh
index c3dcf52a..a42004f8 100755
--- a/test/T170-sexp.sh
+++ b/test/T170-sexp.sh
@@ -5,12 +5,12 @@ test_description="--format=sexp output"
test_begin_subtest "Show message: sexp"
add_message "[subject]=\"sexp-show-subject\"" "[date]=\"Sat, 01 Jan 2000
12:00:00 -0000\"" "[bcc]=\"test_suite+...@notmuchmail.org\""
"[reply-to]=\"test_suite+repl...@notmuchmail.org\""
"[body]=\"sexp-show-message\""
output=$(notmuch show --format=sexp "sexp-show-message")
-test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil
:filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative
\"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject
\"sexp-show-subject\" :From \"Notmuch Test Suite <test_su...@notmuchmail.org>\"
:To \"Notmuch Test Suite <test_su...@notmuchmail.org>\" :Bcc
\"test_suite+...@notmuchmail.org\" :Reply-To
\"test_suite+repl...@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00
+0000\") :body ((:id 1 :content-type \"text/plain\" :content
\"sexp-show-message\n\"))) ())))"
+test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil
:filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative
\"2000-01-01\" :tags (\"inbox\" \"unread\") :body ((:id 1 :content-type
\"text/plain\" :content \"sexp-show-message\n\")) :headers (:Subject
\"sexp-show-subject\" :From \"Notmuch Test Suite <test_su...@notmuchmail.org>\"
:To \"Notmuch Test Suite <test_su...@notmuchmail.org>\" :Bcc
\"test_suite+...@notmuchmail.org\" :Reply-To
\"test_suite+repl...@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00
+0000\")) ())))"
# This should be the same output as above.
test_begin_subtest "Show message: sexp --body=true"
output=$(notmuch show --format=sexp --body=true "sexp-show-message")
-test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil
:filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative
\"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject
\"sexp-show-subject\" :From \"Notmuch Test Suite <test_su...@notmuchmail.org>\"
:To \"Notmuch Test Suite <test_su...@notmuchmail.org>\" :Bcc
\"test_suite+...@notmuchmail.org\" :Reply-To
\"test_suite+repl...@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00
+0000\") :body ((:id 1 :content-type \"text/plain\" :content
\"sexp-show-message\n\"))) ())))"
+test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil
:filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative
\"2000-01-01\" :tags (\"inbox\" \"unread\") :body ((:id 1 :content-type
\"text/plain\" :content \"sexp-show-message\n\")) :headers (:Subject
\"sexp-show-subject\" :From \"Notmuch Test Suite <test_su...@notmuchmail.org>\"
:To \"Notmuch Test Suite <test_su...@notmuchmail.org>\" :Bcc
\"test_suite+...@notmuchmail.org\" :Reply-To
\"test_suite+repl...@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00
+0000\")) ())))"
test_begin_subtest "Show message: sexp --body=false"
output=$(notmuch show --format=sexp --body=false "sexp-show-message")
@@ -24,7 +24,7 @@ test_expect_equal "$output" "((:thread \"0000000000000002\"
:timestamp 946728000
test_begin_subtest "Show message: sexp, utf-8"
add_message "[subject]=\"sexp-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan
2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\""
output=$(notmuch show --format=sexp "jsön-show-méssage")
-test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil
:filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative
\"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject
\"sexp-show-utf8-body-sübjéct\" :From \"Notmuch Test Suite
<test_su...@notmuchmail.org>\" :To \"Notmuch Test Suite
<test_su...@notmuchmail.org>\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body
((:id 1 :content-type \"text/plain\" :content \"jsön-show-méssage\n\"))) ())))"
+test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil
:filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative
\"2000-01-01\" :tags (\"inbox\" \"unread\") :body ((:id 1 :content-type
\"text/plain\" :content \"jsön-show-méssage\n\")) :headers (:Subject
\"sexp-show-utf8-body-sübjéct\" :From \"Notmuch Test Suite
<test_su...@notmuchmail.org>\" :To \"Notmuch Test Suite
<test_su...@notmuchmail.org>\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\"))
())))"
test_begin_subtest "Search message: sexp, utf-8"
add_message "[subject]=\"sexp-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01
Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\""
@@ -44,6 +44,6 @@ output=$(notmuch show --format=sexp "id:$id")
filename=$(notmuch search --output=files "id:$id")
# Get length of README after base64-encoding, minus additional newline.
attachment_length=$(( $(base64 $NOTMUCH_SRCDIR/test/README | wc -c) - 1 ))
-test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename
(\"$filename\") :timestamp 946728000 :date_relative \"2000-01-01\" :tags
(\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From
\"Notmuch Test Suite <test_su...@notmuchmail.org>\" :To
\"test_su...@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body
((:id 1 :content-type \"multipart/mixed\" :content ((:id 2 :content-type
\"text/plain\" :content \"This is a test message with inline attachment with a
filename\") (:id 3 :content-type \"application/octet-stream\"
:content-disposition \"inline\" :filename \"README\" :content-transfer-encoding
\"base64\" :content-length $attachment_length))))) ())))"
+test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename
(\"$filename\") :timestamp 946728000 :date_relative \"2000-01-01\" :tags
(\"inbox\") :body ((:id 1 :content-type \"multipart/mixed\" :content ((:id 2
:content-type \"text/plain\" :content \"This is a test message with inline
attachment with a filename\") (:id 3 :content-type \"application/octet-stream\"
:content-disposition \"inline\" :filename \"README\" :content-transfer-encoding
\"base64\" :content-length $attachment_length)))) :headers (:Subject
\"sexp-show-inline-attachment-filename\" :From \"Notmuch Test Suite
<test_su...@notmuchmail.org>\" :To \"test_su...@notmuchmail.org\" :Date \"Sat,
01 Jan 2000 12:00:00 +0000\")) ())))"
test_done
--
2.17.0
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
