From 3434f99e464cfd16bd2ba5d8122a844e04df8eea Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sat, 4 Feb 2012 19:32:00 +1900 Subject: [PATCH] Re: [PATCH 2/2] show: Simplify new text formatter code --- 2d/cfef08e6492f981ab7602c4b6b8079a02db4f8 | 383 ++++++++++++++++++++++ 1 file changed, 383 insertions(+) create mode 100644 2d/cfef08e6492f981ab7602c4b6b8079a02db4f8 diff --git a/2d/cfef08e6492f981ab7602c4b6b8079a02db4f8 b/2d/cfef08e6492f981ab7602c4b6b8079a02db4f8 new file mode 100644 index 000000000..762db0f33 --- /dev/null +++ b/2d/cfef08e6492f981ab7602c4b6b8079a02db4f8 @@ -0,0 +1,383 @@ +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 8BDD8431FAF + for ; Fri, 3 Feb 2012 16:33:09 -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 Qv7fiGaGzlRt for ; + Fri, 3 Feb 2012 16:33:07 -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 1005B431FC2 + for ; Fri, 3 Feb 2012 16:33:06 -0800 (PST) +X-AuditID: 1209190f-b7f8a6d000000914-1a-4f2c7cc24338 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP + id DB.4A.02324.2CC7C2F4; Fri, 3 Feb 2012 19:33:06 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q140X69X026268; + Fri, 3 Feb 2012 19:33:06 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q140X34w013090 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Fri, 3 Feb 2012 19:33:04 -0500 (EST) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1RtTXs-0001lI-Jw; Fri, 03 Feb 2012 19:32:00 -0500 +Date: Fri, 3 Feb 2012 19:32:00 -0500 +From: Austin Clements +To: Dmitry Kurochkin +Subject: Re: [PATCH 2/2] show: Simplify new text formatter code +Message-ID: <20120204003200.GK10898@mit.edu> +References: <1327560926-22401-1-git-send-email-amdragon@mit.edu> + <1327560926-22401-3-git-send-email-amdragon@mit.edu> + <87lioooj7m.fsf@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <87lioooj7m.fsf@gmail.com> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrNKsWRmVeSWpSXmKPExsUixG6nrnuoRsffYNIsZYurW/vZLZqmO1vs + 2edlcf3mTGaLNyvnsTqwetw9zeWxc9Zddo/DXxeyeNy6/5rd49mqW8wBrFFcNimpOZllqUX6 + dglcGe/n/GAp+BtScW3nJKYGxrVOXYycHBICJhKHu/tZIWwxiQv31rN1MXJxCAnsY5TYcHM+ + O4SznlFi17lXrBDOCSaJyXdnQjlLGCVOXv3OBNLPIqAicWbRSxYQm01AQ2Lb/uWMILaIgKHE + rYuvmEFsZoFUif8bmsDqhQXsJRbM2Q5m8wroSMw41MMIMXQKo8TrlpXMEAlBiZMzn7BANGtJ + 3Pj3EqiBA8iWllj+jwPE5BRQl7g/VxekQhTohCknt7FNYBSahaR5FpLmWQjNCxiZVzHKpuRW + 6eYmZuYUpybrFicn5uWlFuma6OVmluilppRuYgTFA6ck/w7GbweVDjEKcDAq8fBu0NPxF2JN + LCuuzD3EKMnBpCTKa1sNFOJLyk+pzEgszogvKs1JLT7EKMHBrCTCa6UOlONNSaysSi3Kh0lJ + c7AoifOqab3zExJITyxJzU5NLUgtgsnKcHAoSfAaA+NeSLAoNT21Ii0zpwQhzcTBCTKcB2i4 + NkgNb3FBYm5xZjpE/hSjLsfnU5/PMwqx5OXnpUqJ83KDFAmAFGWU5sHNgaWxV4ziQG8J8xqA + VPEAUyDcpFdAS5iAljBYaIIsKUlESEk1MBp82mS9qP38FdU/GSvZVv0OPuS7KNiHa/pmrdd7 + /Zz37Px5s5rzjaZKpP22rwaPZ5gypU68nP1i0+lpoVmNCZ7M70Ncdt4tV++4vP6lUcQLk0Ox + GXEJTwoNjj6KZC+NmzePbwnrtKaiBx1FZVqna4wm8UncnHGh8cK8C/ukWWWvfzzWF3b2IbsS + S3FGoqEWc1FxIgBmi4GnPgMAAA== +Cc: tomi.ollila@iki.fi, notmuch@notmuchmail.org +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: Sat, 04 Feb 2012 00:33:09 -0000 + +Quoth Dmitry Kurochkin on Jan 31 at 3:37 am: +> On Thu, 26 Jan 2012 01:55:26 -0500, Austin Clements wrote: +> > This makes the text formatter take advantage of the new code +> > structure. The previously duplicated header logic is now unified, +> > several things that we used to compute repeatedly across different +> > callbacks are now computed once, and the code is simpler overall and +> > 32% shorter. +> > +> > Unifying the header logic causes this to format some dates slightly +> > differently, so the two affected test cases are updated. +> > --- +> +> Looks good to me. Two minor comments, which can be freely ignored, are +> below. +> +> > notmuch-show.c | 88 +++++++++++++-------------------------------------- +> > test/crypto | 2 +- +> > test/thread-naming | 16 +++++----- +> > 3 files changed, 32 insertions(+), 74 deletions(-) +> > +> > diff --git a/notmuch-show.c b/notmuch-show.c +> > index 6a890b2..30f6501 100644 +> > --- a/notmuch-show.c +> > +++ b/notmuch-show.c +> > @@ -727,67 +727,48 @@ format_part_text (const void *ctx, mime_node_t *node, +> > GMimeObject *meta = node->envelope_part ? +> > GMIME_OBJECT (node->envelope_part) : node->part; +> > GMimeContentType *content_type = g_mime_object_get_content_type (meta); +> > + const notmuch_bool_t leaf = GMIME_IS_PART (node->part); +> > + const char *part_type; +> > int i; +> > +> > if (node->envelope_file) { +> > notmuch_message_t *message = node->envelope_file; +> > - const char *headers[] = { +> > - "Subject", "From", "To", "Cc", "Bcc", "Date" +> > - }; +> > - const char *name, *value; +> > - unsigned int i; +> > +> > - printf ("\fmessage{ "); +> > - printf ("id:%s depth:%d match:%d filename:%s\n", +> > + part_type = "message"; +> > + printf ("\f%s{ id:%s depth:%d match:%d filename:%s\n", +> > + part_type, +> > notmuch_message_get_message_id (message), +> > indent, +> > notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH), +> > notmuch_message_get_filename (message)); +> > - +> > - printf ("\fheader{\n"); +> > - +> > - printf ("%s\n", _get_one_line_summary (ctx, message)); +> > - +> > - for (i = 0; i < ARRAY_SIZE (headers); i++) { +> > - name = headers[i]; +> > - value = notmuch_message_get_header (message, name); +> > - if (value && strlen (value)) +> > - printf ("%s: %s\n", name, value); +> > - } +> > - printf ("\fheader}\n"); +> > } else { +> > GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (meta); +> > const char *cid = g_mime_object_get_content_id (meta); +> > + const char *filename = leaf ? +> > + g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; +> > +> > if (disposition && +> > strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) +> > - { +> > - printf ("\fattachment{ ID: %d", node->part_num); +> > - +> > - } else { +> > - +> > - printf ("\fpart{ ID: %d", node->part_num); +> > - } +> > - +> > - if (GMIME_IS_PART (node->part)) +> > - { +> > - const char *filename = g_mime_part_get_filename (GMIME_PART (node->part)); +> > - if (filename) +> > - printf (", Filename: %s", filename); +> > - } +> > + part_type = "attachment"; +> > + else +> > + part_type = "part"; +> +> Others may disagree, but I would write this using the (? :) operator. +> Not important, feel free to leave it as is. + +Normally I would, too, but when the condition is that long, I find it +makes it more obtuse. + +> > +> > + printf ("\f%s{ ID: %d", part_type, node->part_num); +> > + if (filename) +> > + printf (", Filename: %s", filename); +> > if (cid) +> > printf (", Content-id: %s", cid); +> > - +> > printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type)); +> > } +> > +> > - if (node->envelope_part) { +> > + if (GMIME_IS_MESSAGE (node->part)) { +> > GMimeMessage *message = GMIME_MESSAGE (node->part); +> > InternetAddressList *recipients; +> > const char *recipients_string; +> > +> > printf ("\fheader{\n"); +> > + if (node->envelope_file) +> > + printf ("%s\n", _get_one_line_summary (ctx, node->envelope_file)); +> > printf ("Subject: %s\n", g_mime_message_get_subject (message)); +> > printf ("From: %s\n", g_mime_message_get_sender (message)); +> > recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); +> > @@ -800,9 +781,11 @@ format_part_text (const void *ctx, mime_node_t *node, +> > printf ("Cc: %s\n", recipients_string); +> > printf ("Date: %s\n", g_mime_message_get_date_as_string (message)); +> > printf ("\fheader}\n"); +> > + +> > + printf ("\fbody{\n"); +> > } +> > +> > - if (!node->envelope_file) { +> > + if (leaf) { +> > if (g_mime_content_type_is_type (content_type, "text", "*") && +> > !g_mime_content_type_is_type (content_type, "text", "html")) +> > { +> > @@ -810,45 +793,20 @@ format_part_text (const void *ctx, mime_node_t *node, +> > g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); +> > show_text_part_content (node->part, stream_stdout); +> > g_object_unref(stream_stdout); +> > - } +> > - else if (g_mime_content_type_is_type (content_type, "multipart", "*") || +> > - g_mime_content_type_is_type (content_type, "message", "rfc822")) +> > - { +> > - /* Do nothing for multipart since its content will be printed +> > - * when recursing. */ +> > - } +> > - else +> > - { +> > + } else { +> > printf ("Non-text part: %s\n", +> > g_mime_content_type_to_string (content_type)); +> > } +> > } +> > +> > - if (GMIME_IS_MESSAGE (node->part)) +> > - printf ("\fbody{\n"); +> > - +> > for (i = 0; i < node->nchildren; i++) +> > format_part_text (ctx, mime_node_child (node, i), indent, params); +> > +> > - if (GMIME_IS_MESSAGE (node->part)) +> > + if (GMIME_IS_MESSAGE (node->part)) { +> +> Since the if body is one line, I would prefer to remove the closing +> bracket rather than adding the opening one. + +Oops. That must have been a rebasing mixup. Fixed. + +> Regards, +> Dmitry +> +> > printf ("\fbody}\n"); +> > - +> > - if (node->envelope_file) { +> > - printf ("\fmessage}\n"); +> > - } else { +> > - GMimeContentDisposition *disposition; +> > - +> > - disposition = g_mime_object_get_content_disposition (meta); +> > - if (disposition && +> > - strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) +> > - { +> > - printf ("\fattachment}\n"); +> > - } +> > - else +> > - { +> > - printf ("\fpart}\n"); +> > - } +> > } +> > + +> > + printf ("\f%s}\n", part_type); +> > } +> > +> > static void +> > diff --git a/test/crypto b/test/crypto +> > index 446a58b..1dbb60a 100755 +> > --- a/test/crypto +> > +++ b/test/crypto +> > @@ -159,7 +159,7 @@ Notmuch Test Suite (2000-01-01) (encrypted inbox) +> > Subject: test encrypted message 001 +> > From: Notmuch Test Suite +> > To: test_suite@notmuchmail.org +> > -Date: 01 Jan 2000 12:00:00 -0000 +> > +Date: Sat, 01 Jan 2000 12:00:00 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: multipart/encrypted +> > diff --git a/test/thread-naming b/test/thread-naming +> > index 2ce9216..942e593 100755 +> > --- a/test/thread-naming +> > +++ b/test/thread-naming +> > @@ -71,7 +71,7 @@ Notmuch Test Suite (2001-01-05) (unread) +> > Subject: thread-naming: Initial thread subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Fri, 05 Jan 2001 15:43:56 -0000 +> > +Date: Fri, 05 Jan 2001 15:43:56 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -85,7 +85,7 @@ Notmuch Test Suite (2001-01-06) (inbox unread) +> > Subject: thread-naming: Older changed subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Sat, 06 Jan 2001 15:43:56 -0000 +> > +Date: Sat, 06 Jan 2001 15:43:56 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -99,7 +99,7 @@ Notmuch Test Suite (2001-01-07) (inbox unread) +> > Subject: thread-naming: Newer changed subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Sun, 07 Jan 2001 15:43:56 -0000 +> > +Date: Sun, 07 Jan 2001 15:43:56 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -113,7 +113,7 @@ Notmuch Test Suite (2001-01-08) (unread) +> > Subject: thread-naming: Final thread subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Mon, 08 Jan 2001 15:43:56 -0000 +> > +Date: Mon, 08 Jan 2001 15:43:56 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -127,7 +127,7 @@ Notmuch Test Suite (2001-01-09) (inbox unread) +> > Subject: Re: thread-naming: Initial thread subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Tue, 09 Jan 2001 15:43:45 -0000 +> > +Date: Tue, 09 Jan 2001 15:43:45 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -141,7 +141,7 @@ Notmuch Test Suite (2001-01-10) (inbox unread) +> > Subject: Aw: thread-naming: Initial thread subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Wed, 10 Jan 2001 15:43:45 -0000 +> > +Date: Wed, 10 Jan 2001 15:43:45 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -155,7 +155,7 @@ Notmuch Test Suite (2001-01-11) (inbox unread) +> > Subject: Vs: thread-naming: Initial thread subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Thu, 11 Jan 2001 15:43:45 -0000 +> > +Date: Thu, 11 Jan 2001 15:43:45 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> > @@ -169,7 +169,7 @@ Notmuch Test Suite (2001-01-12) (inbox unread) +> > Subject: Sv: thread-naming: Initial thread subject +> > From: Notmuch Test Suite +> > To: Notmuch Test Suite +> > -Date: Fri, 12 Jan 2001 15:43:45 -0000 +> > +Date: Fri, 12 Jan 2001 15:43:45 +0000 +> > +header} +> > +body{ +> > +part{ ID: 1, Content-type: text/plain +> -- 2.26.2