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