[PATCH v5b] show: indicate charset for all omitted parts

diff --git a/01/476340ef9f3bb70a3c18e2f8ab829b058c96bd b/01/476340ef9f3bb70a3c18e2f8ab829b058c96bd
new file mode 100644 (file)
index 0000000..04d7213
--- /dev/null
+++ b/01/476340ef9f3bb70a3c18e2f8ab829b058c96bd
@@ -0,0 +1,121 @@
+Return-Path: <novalazy@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 9041E431FBD\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 15:23:59 -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 LPmyJY0MksO8 for <notmuch@notmuchmail.org>;\r
+       Sat, 15 Dec 2012 15:23:59 -0800 (PST)\r
+Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com\r
+       [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id ECDCC431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 15:23:58 -0800 (PST)\r
+Received: by mail-pa0-f53.google.com with SMTP id hz1so2966461pad.26\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 15:23:58 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=tE75JGd2ikxQV9e93UiWLvzaZrmroKLjWoRJQIlgTps=;\r
+       b=rHJQv51ixnSlZl246uK9aGdXzOtLFfIMVD8MavLCe0R2DyoTMNUSzSSE+qeaC8ldpP\r
+       jd1SPel5OAeCXvBwisGRhq6cIjUtCy9gFVHPtneQvzHI68kEfA8KbAmYf0P0C49Tu7b/\r
+       ju6vwToMrMzWGR6HWkdothUSkCc6CKhsHmXDhgCjrb7KKcbkK7y5/DbMG+GztzpKSH9U\r
+       YADY3ZQnttE7OYvPEXmMtW4e3wfHbjew1IoB/uJ5NtF05yHZIju1KaDmlzRo87Nk6Lxv\r
+       9DWse8NGtWuN4cSz9RyqljKfa2298HgT6wMmt4D8TjvxlvpOpzkSAKRx8NKDzbu7C0ec\r
+       ncGA==\r
+Received: by 10.68.134.130 with SMTP id pk2mr28716388pbb.31.1355613837222;\r
+       Sat, 15 Dec 2012 15:23:57 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id c2sm5697259pay.34.2012.12.15.15.23.54\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 15 Dec 2012 15:23:56 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5b] show: indicate charset for all omitted parts\r
+Date: Sun, 16 Dec 2012 10:22:50 +1100\r
+Message-Id: <1355613770-3793-1-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1355540805-24937-3-git-send-email-novalazy@gmail.com>\r
+References: <1355540805-24937-3-git-send-email-novalazy@gmail.com>\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: Sat, 15 Dec 2012 23:23:59 -0000\r
+\r
+Write a "charset" field for all omitted parts for which it is applicable,\r
+not only text/html parts. Factor out the code to a separate function.\r
+It will be extended with more fields next.\r
+---\r
+ notmuch-show.c | 24 ++++++++++++++++--------\r
+ 1 file changed, 16 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index a83fef9..6a9278c 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -599,6 +599,17 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+     return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+ \r
++static void\r
++format_omitted_part_meta_sprinter (sprinter_t *sp, GMimeObject *meta)\r
++{\r
++    const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset");\r
++\r
++    if (content_charset != NULL) {\r
++      sp->map_key (sp, "content-charset");\r
++      sp->string (sp, content_charset);\r
++    }\r
++}\r
++\r
+ void\r
+ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+                     notmuch_bool_t first, notmuch_bool_t output_body)\r
+@@ -677,14 +688,9 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+        * makes charset decoding the responsibility on the caller, we\r
+        * report the charset for text/html parts.\r
+        */\r
+-      if (g_mime_content_type_is_type (content_type, "text", "html")) {\r
+-          const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset");\r
+-\r
+-          if (content_charset != NULL) {\r
+-              sp->map_key (sp, "content-charset");\r
+-              sp->string (sp, content_charset);\r
+-          }\r
+-      } else if (g_mime_content_type_is_type (content_type, "text", "*")) {\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_memory = g_mime_stream_mem_new ();\r
+           GByteArray *part_content;\r
+           show_text_part_content (node->part, stream_memory, 0);\r
+@@ -692,6 +698,8 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+           sp->map_key (sp, "content");\r
+           sp->string_len (sp, (char *) part_content->data, part_content->len);\r
+           g_object_unref (stream_memory);\r
++      } else {\r
++          format_omitted_part_meta_sprinter (sp, meta);\r
+       }\r
+     } else if (GMIME_IS_MULTIPART (node->part)) {\r
+       sp->map_key (sp, "content");\r
+-- \r
+1.7.12.1\r
+\r