From 6d4392eff9f12728c00f539d55509fb57be3b759 Mon Sep 17 00:00:00 2001 From: Dmitry Kurochkin Date: Tue, 31 Jan 2012 03:26:54 +0400 Subject: [PATCH] Re: [PATCH 1/2] show: Convert text format to the new self-recursive style --- d4/219cd3cafde20efb76008df5621309b489940c | 405 ++++++++++++++++++++++ 1 file changed, 405 insertions(+) create mode 100644 d4/219cd3cafde20efb76008df5621309b489940c diff --git a/d4/219cd3cafde20efb76008df5621309b489940c b/d4/219cd3cafde20efb76008df5621309b489940c new file mode 100644 index 000000000..5a7a55457 --- /dev/null +++ b/d4/219cd3cafde20efb76008df5621309b489940c @@ -0,0 +1,405 @@ +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 3DF07429E34 + for ; Mon, 30 Jan 2012 15:28:11 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, 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 Yq5nCQxu66Wg for ; + Mon, 30 Jan 2012 15:28:10 -0800 (PST) +Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com + [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id E34C7431FBC + for ; Mon, 30 Jan 2012 15:28:09 -0800 (PST) +Received: by bke11 with SMTP id 11so1966603bke.26 + for ; Mon, 30 Jan 2012 15:28:07 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:in-reply-to:references:user-agent:date + :message-id:mime-version:content-type; + bh=mbuQw/B0PnznXEEAcLjDBTe2kUEH0KGJLabzDP30axw=; + b=Y3igghs0VUe0Ro0hIdH4m3BZApEqZc2g0mc/CrcxTjaxbIQqjgS51CHgdBHGLEybLg + IomGJMtRh/efYlgUBRZ8iJkDeNg+gKCCvGmehjXLjnPYxWVaiGn2vwhprPYW/cLporTo + 9x1NQ3Q9SVif+HEct0O/zeigPVI+WeGeLgfSw= +Received: by 10.204.10.86 with SMTP id o22mr915819bko.111.1327966087053; + Mon, 30 Jan 2012 15:28:07 -0800 (PST) +Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id + fg16sm40860977bkb.16.2012.01.30.15.28.04 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 15:28:05 -0800 (PST) +From: Dmitry Kurochkin +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 1/2] show: Convert text format to the new self-recursive + style +In-Reply-To: <1327560926-22401-2-git-send-email-amdragon@mit.edu> +References: <1327560926-22401-1-git-send-email-amdragon@mit.edu> + <1327560926-22401-2-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.11+139~gd9b7cab (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-pc-linux-gnu) +Date: Tue, 31 Jan 2012 03:26:54 +0400 +Message-ID: <87obtkojpd.fsf@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +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, 30 Jan 2012 23:28:11 -0000 + +On Thu, 26 Jan 2012 01:55:25 -0500, Austin Clements wrote: +> This is all code movement and a smidgen of glue. This moves the +> existing text formatter code into one self-recursive function, but +> doesn't change any of the logic. The next patch will actually take +> advantage of what the new structure has to offer. +> +> Note that this patch retains format_headers_message_part_text because +> it is also used by the raw format. +> --- +> notmuch-show.c | 270 +++++++++++++++++++++++++++++--------------------------- +> 1 files changed, 139 insertions(+), 131 deletions(-) +> +> diff --git a/notmuch-show.c b/notmuch-show.c +> index dec799c..6a890b2 100644 +> --- a/notmuch-show.c +> +++ b/notmuch-show.c +> @@ -21,40 +21,17 @@ +> #include "notmuch-client.h" +> +> static void +> -format_message_text (unused (const void *ctx), +> - notmuch_message_t *message, +> - int indent); +> -static void +> -format_headers_text (const void *ctx, +> - notmuch_message_t *message); +> - +> -static void +> format_headers_message_part_text (GMimeMessage *message); +> +> static void +> -format_part_start_text (GMimeObject *part, +> - int *part_count); +> - +> -static void +> -format_part_content_text (GMimeObject *part); +> - +> -static void +> -format_part_end_text (GMimeObject *part); +> +format_part_text (const void *ctx, mime_node_t *node, +> + int indent, const notmuch_show_params_t *params); +> +> static const notmuch_show_format_t format_text = { +> - "", NULL, +> - "\fmessage{ ", format_message_text, +> - "\fheader{\n", format_headers_text, format_headers_message_part_text, "\fheader}\n", +> - "\fbody{\n", +> - format_part_start_text, +> - NULL, +> - NULL, +> - format_part_content_text, +> - format_part_end_text, +> - "", +> - "\fbody}\n", +> - "\fmessage}\n", "", +> - "" +> + .message_set_start = "", +> + .part = format_part_text, +> + .message_set_sep = "", +> + .message_set_end = "" + +I guess I missed this during the first review. I think we should +support NULL values for message_set_* members (in a separate patch, I +guess). This would allow us to explicitly initialize only part member +in the above code. + +Looks good otherwise. + +Regards, + Dmitry + +> }; +> +> static void +> @@ -191,16 +168,6 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) +> } +> +> static void +> -format_message_text (unused (const void *ctx), notmuch_message_t *message, int indent) +> -{ +> - printf ("id:%s depth:%d match:%d filename:%s\n", +> - notmuch_message_get_message_id (message), +> - indent, +> - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH), +> - notmuch_message_get_filename (message)); +> -} +> - +> -static void +> format_message_json (const void *ctx, notmuch_message_t *message, unused (int indent)) +> { +> notmuch_tags_t *tags; +> @@ -338,26 +305,6 @@ format_message_mbox (const void *ctx, +> fclose (file); +> } +> +> - +> -static void +> -format_headers_text (const void *ctx, notmuch_message_t *message) +> -{ +> - const char *headers[] = { +> - "Subject", "From", "To", "Cc", "Bcc", "Date" +> - }; +> - const char *name, *value; +> - unsigned int i; +> - +> - 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); +> - } +> -} +> - +> static void +> format_headers_message_part_text (GMimeMessage *message) +> { +> @@ -523,78 +470,6 @@ signer_status_to_string (GMimeSignerStatus x) +> #endif +> +> static void +> -format_part_start_text (GMimeObject *part, int *part_count) +> -{ +> - GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part); +> - +> - if (disposition && +> - strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) +> - { +> - printf ("\fattachment{ ID: %d", *part_count); +> - +> - } else { +> - +> - printf ("\fpart{ ID: %d", *part_count); +> - } +> -} +> - +> -static void +> -format_part_content_text (GMimeObject *part) +> -{ +> - const char *cid = g_mime_object_get_content_id (part); +> - GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); +> - +> - if (GMIME_IS_PART (part)) +> - { +> - const char *filename = g_mime_part_get_filename (GMIME_PART (part)); +> - 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 (g_mime_content_type_is_type (content_type, "text", "*") && +> - !g_mime_content_type_is_type (content_type, "text", "html")) +> - { +> - GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); +> - g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); +> - show_text_part_content (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 +> - { +> - printf ("Non-text part: %s\n", +> - g_mime_content_type_to_string (content_type)); +> - } +> -} +> - +> -static void +> -format_part_end_text (GMimeObject *part) +> -{ +> - GMimeContentDisposition *disposition; +> - +> - disposition = g_mime_object_get_content_disposition (part); +> - if (disposition && +> - strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) +> - { +> - printf ("\fattachment}\n"); +> - } +> - else +> - { +> - printf ("\fpart}\n"); +> - } +> -} +> - +> -static void +> format_part_start_json (unused (GMimeObject *part), int *part_count) +> { +> printf ("{\"id\": %d", *part_count); +> @@ -844,6 +719,139 @@ format_part_content_raw (GMimeObject *part) +> } +> +> static void +> +format_part_text (const void *ctx, mime_node_t *node, +> + int indent, const notmuch_show_params_t *params) +> +{ +> + /* The disposition and content-type metadata are associated with +> + * the envelope for message parts */ +> + GMimeObject *meta = node->envelope_part ? +> + GMIME_OBJECT (node->envelope_part) : node->part; +> + GMimeContentType *content_type = g_mime_object_get_content_type (meta); +> + 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", +> + 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); +> + +> + 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); +> + } +> + +> + if (cid) +> + printf (", Content-id: %s", cid); +> + +> + printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type)); +> + } +> + +> + if (node->envelope_part) { +> + GMimeMessage *message = GMIME_MESSAGE (node->part); +> + InternetAddressList *recipients; +> + const char *recipients_string; +> + +> + printf ("\fheader{\n"); +> + 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); +> + recipients_string = internet_address_list_to_string (recipients, 0); +> + if (recipients_string) +> + printf ("To: %s\n", recipients_string); +> + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); +> + recipients_string = internet_address_list_to_string (recipients, 0); +> + if (recipients_string) +> + printf ("Cc: %s\n", recipients_string); +> + printf ("Date: %s\n", g_mime_message_get_date_as_string (message)); +> + printf ("\fheader}\n"); +> + } +> + +> + if (!node->envelope_file) { +> + if (g_mime_content_type_is_type (content_type, "text", "*") && +> + !g_mime_content_type_is_type (content_type, "text", "html")) +> + { +> + GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); +> + 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 +> + { +> + 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)) +> + 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"); +> + } +> + } +> +} +> + +> +static void +> show_message (void *ctx, +> const notmuch_show_format_t *format, +> notmuch_message_t *message, +> -- +> 1.7.7.3 +> -- 2.26.2