From 9370e6cc426611952e767de16d0141c4fd4c39fc Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 20 Feb 2012 19:26:25 +1900 Subject: [PATCH] [PATCH v2 3/8] show: Use consistent header ordering in the JSON format --- a5/9f6a4e6536354fa23ebec99799a43dc68adc3f | 151 ++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 a5/9f6a4e6536354fa23ebec99799a43dc68adc3f diff --git a/a5/9f6a4e6536354fa23ebec99799a43dc68adc3f b/a5/9f6a4e6536354fa23ebec99799a43dc68adc3f new file mode 100644 index 000000000..4f5b6db07 --- /dev/null +++ b/a5/9f6a4e6536354fa23ebec99799a43dc68adc3f @@ -0,0 +1,151 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id DB978431FAF + for ; Sun, 19 Feb 2012 16:26:37 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id d6AMw5XZ7hBb for ; + Sun, 19 Feb 2012 16:26:36 -0800 (PST) +Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU + [18.9.25.15]) + by olra.theworths.org (Postfix) with ESMTP id 455AA431FAE + for ; Sun, 19 Feb 2012 16:26:36 -0800 (PST) +X-AuditID: 1209190f-b7f8a6d000000914-58-4f41933b1097 +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP + id 0E.84.02324.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZRr024835; + Sun, 19 Feb 2012 19:26:35 -0500 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1K0QXd3000301 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 19 Feb 2012 19:26:34 -0500 (EST) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1RzH5N-0001yI-GQ; Sun, 19 Feb 2012 19:26:33 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 3/8] show: Use consistent header ordering in the JSON + format +Date: Sun, 19 Feb 2012 19:26:25 -0500 +Message-Id: <1329697590-7404-4-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.7.3 +In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu> +References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> + <1329697590-7404-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrWs92dHf4MR7Y4vrN2cyW7xZOY/V + gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mr4cMin4JlmxfLli1gbGD8odzFyckgImEjM + 3HCREcIWk7hwbz1bFyMXh5DAPkaJzh8/mCGcDYwSd/ZtYIdw7jNJHD/wlhHCmc8oce/wH7B+ + NgENiW37l4PZIgLSEjvvzmYFsZkFrCQOX90EZgsL+EscXbAWzGYRUJX4vGAdkM3BwStgL3H0 + nwPEGQoS51afYwcJcwo4SKze4QoSFhIolTjyZAvTBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT + 8/JSi3RN9HIzS/RSU0o3MYLDSJJ/B+O3g0qHGAU4GJV4eKXKHPyFWBPLiitzDzFKcjApifKe + muDoL8SXlJ9SmZFYnBFfVJqTWnyIUYKDWUmEd4E9UI43JbGyKrUoHyYlzcGiJM6rpvXOT0gg + PbEkNTs1tSC1CCYrw8GhJMHbMAmoUbAoNT21Ii0zpwQhzcTBCTKcB2i4IkgNb3FBYm5xZjpE + /hSjopQ4rw1IQgAkkVGaB9cLi/NXjOJArwjzpoFU8QBTBFz3K6DBTECDeYXsQAaXJCKkpBoY + fY++d/sxuX/K8pbtm3Y3si9X8X1hvfE2q2/l1FkMyav3Ox09vLNw2fq+1iauxAbOJXPLovSP + ta68fH7bq9tTC36UaE1umHeOMUbqeYzpEf5Lt1KWdtec3jbrffOFKXZRd55bTP5j4rD8yrWt + jQvOOfxiCWKatuDU2pCTGw523zOcoHMnV7VfxliJpTgj0VCLuag4EQAR+q+zzgIAAA== +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 20 Feb 2012 00:26:38 -0000 + +Previously, top-level message headers were printed as Subject, From, +To, Date, while embedded message headers were printed From, To, +Subject, Date. This makes both cases use the former order and updates +the tests accordingly. +--- + notmuch-show.c | 6 +++--- + test/multipart | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index 868b2cd..9ca9882 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -328,6 +328,9 @@ format_headers_message_part_json (GMimeMessage *message) + const char *recipients_string; + + printf ("%s: %s", ++ json_quote_str (ctx_quote, "Subject"), ++ json_quote_str (ctx_quote, g_mime_message_get_subject (message))); ++ printf (", %s: %s", + json_quote_str (ctx_quote, "From"), + json_quote_str (ctx_quote, g_mime_message_get_sender (message))); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); +@@ -343,9 +346,6 @@ format_headers_message_part_json (GMimeMessage *message) + json_quote_str (ctx_quote, "Cc"), + json_quote_str (ctx_quote, recipients_string)); + printf (", %s: %s", +- json_quote_str (ctx_quote, "Subject"), +- json_quote_str (ctx_quote, g_mime_message_get_subject (message))); +- printf (", %s: %s", + json_quote_str (ctx_quote, "Date"), + json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message))); + +diff --git a/test/multipart b/test/multipart +index 2dd73f5..4d14804 100755 +--- a/test/multipart ++++ b/test/multipart +@@ -325,7 +325,7 @@ cat <EXPECTED + {"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "${MAIL_DIR}/multipart", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [ + {"id": 1, "content-type": "multipart/signed", "content": [ + {"id": 2, "content-type": "multipart/mixed", "content": [ +-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth ", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ ++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ + {"id": 4, "content-type": "multipart/alternative", "content": [ + {"id": 5, "content-type": "text/html"}, + {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, +@@ -342,7 +342,7 @@ cat <EXPECTED + + {"id": 1, "content-type": "multipart/signed", "content": [ + {"id": 2, "content-type": "multipart/mixed", "content": [ +-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth ", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ ++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ + {"id": 4, "content-type": "multipart/alternative", "content": [ + {"id": 5, "content-type": "text/html"}, + {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, +@@ -358,7 +358,7 @@ echo >>OUTPUT # expect *no* newline at end of output + cat <EXPECTED + + {"id": 2, "content-type": "multipart/mixed", "content": [ +-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth ", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ ++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ + {"id": 4, "content-type": "multipart/alternative", "content": [ + {"id": 5, "content-type": "text/html"}, + {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]}, +@@ -372,7 +372,7 @@ notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org' | s + echo >>OUTPUT # expect *no* newline at end of output + cat <EXPECTED + +-{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"From": "Carl Worth ", "To": "cworth@cworth.org", "Subject": "html message", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ ++{"id": 3, "content-type": "message/rfc822", "content": [{"headers": {"Subject": "html message", "From": "Carl Worth ", "To": "cworth@cworth.org", "Date": "Fri, 05 Jan 2001 15:42:57 +0000"}, "body": [ + {"id": 4, "content-type": "multipart/alternative", "content": [ + {"id": 5, "content-type": "text/html"}, + {"id": 6, "content-type": "text/plain", "content": "This is an embedded message, with a multipart/alternative part.\n"}]}]}]} +-- +1.7.7.3 + -- 2.26.2