2009-11-06 19:00:38 +01:00
|
|
|
/* notmuch - Not much of an email program, (just index and search)
|
|
|
|
*
|
|
|
|
* Copyright © 2009 Carl Worth
|
|
|
|
* Copyright © 2009 Keith Packard
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see http://www.gnu.org/licenses/ .
|
|
|
|
*
|
|
|
|
* Authors: Carl Worth <cworth@cworth.org>
|
|
|
|
* Keith Packard <keithp@keithp.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "notmuch-client.h"
|
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
typedef struct show_message_state {
|
|
|
|
int part_count;
|
|
|
|
int in_zone;
|
|
|
|
} show_message_state_t;
|
|
|
|
|
2009-11-06 19:00:38 +01:00
|
|
|
static void
|
notmuch show: Properly nest MIME parts within mulipart parts
Previously, notmuch show flattened all output, losing information
about the nesting of the MIME hierarchy. Now, the output is properly
nested, (both in the --format=text and --format=json output), so that
clients can analyze the original MIME structure.
Internally, this required splitting the final closing delimiter out of
the various show_part functions and putting it into a new
show_part_end function instead. Also, the show_part function now
accepts a new "first" argument that is set not only for the first MIME
part of a message, but also for each first MIME part within a series
of multipart parts. This "first" argument controls the omission of a
preceding comma when printing a part (for json).
Many thanks to David Edmondson <dme@dme.org> for originally
identifying the lack of nesting in the json output and submitting an
early implementation of this feature. Thanks as well to Jameson Graef
Rollins <jrollins@finestructure.net> for carefully shepherding David's
patches through a remarkably long review process, patiently explaining
them, and providing a cleaned up series that led to this final
implementation. Jameson also provided the new emacs code here.
2011-05-18 00:34:57 +02:00
|
|
|
show_message_part (GMimeObject *part,
|
2011-05-24 00:31:32 +02:00
|
|
|
show_message_state_t *state,
|
2011-05-20 20:45:33 +02:00
|
|
|
const notmuch_show_format_t *format,
|
2011-05-24 00:31:32 +02:00
|
|
|
notmuch_show_params_t *params,
|
notmuch show: Properly nest MIME parts within mulipart parts
Previously, notmuch show flattened all output, losing information
about the nesting of the MIME hierarchy. Now, the output is properly
nested, (both in the --format=text and --format=json output), so that
clients can analyze the original MIME structure.
Internally, this required splitting the final closing delimiter out of
the various show_part functions and putting it into a new
show_part_end function instead. Also, the show_part function now
accepts a new "first" argument that is set not only for the first MIME
part of a message, but also for each first MIME part within a series
of multipart parts. This "first" argument controls the omission of a
preceding comma when printing a part (for json).
Many thanks to David Edmondson <dme@dme.org> for originally
identifying the lack of nesting in the json output and submitting an
early implementation of this feature. Thanks as well to Jameson Graef
Rollins <jrollins@finestructure.net> for carefully shepherding David's
patches through a remarkably long review process, patiently explaining
them, and providing a cleaned up series that led to this final
implementation. Jameson also provided the new emacs code here.
2011-05-18 00:34:57 +02:00
|
|
|
int first)
|
2009-11-06 19:00:38 +01:00
|
|
|
{
|
2011-05-24 00:31:32 +02:00
|
|
|
int selected;
|
|
|
|
state->part_count += 1;
|
2011-05-23 07:08:08 +02:00
|
|
|
|
|
|
|
if (! (GMIME_IS_PART (part) || GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))) {
|
|
|
|
fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
|
|
|
|
g_type_name (G_OBJECT_TYPE (part)));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
selected = (params->part <= 0 || state->part_count == params->part);
|
|
|
|
|
|
|
|
if (selected || state->in_zone) {
|
2011-05-24 19:52:38 +02:00
|
|
|
if (!first && (params->part <= 0 || state->in_zone) && format->part_sep)
|
2011-05-24 00:31:32 +02:00
|
|
|
fputs (format->part_sep, stdout);
|
2011-05-23 04:56:53 +02:00
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
format->part (part, &(state->part_count));
|
|
|
|
}
|
2011-05-23 07:08:08 +02:00
|
|
|
|
2009-11-06 19:00:38 +01:00
|
|
|
if (GMIME_IS_MULTIPART (part)) {
|
|
|
|
GMimeMultipart *multipart = GMIME_MULTIPART (part);
|
|
|
|
int i;
|
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
if (selected)
|
|
|
|
state->in_zone = 1;
|
|
|
|
|
2009-11-06 19:00:38 +01:00
|
|
|
for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
|
|
|
|
show_message_part (g_mime_multipart_get_part (multipart, i),
|
2011-05-24 00:31:32 +02:00
|
|
|
state, format, params, i == 0);
|
2009-11-06 19:00:38 +01:00
|
|
|
}
|
notmuch show: Properly nest MIME parts within mulipart parts
Previously, notmuch show flattened all output, losing information
about the nesting of the MIME hierarchy. Now, the output is properly
nested, (both in the --format=text and --format=json output), so that
clients can analyze the original MIME structure.
Internally, this required splitting the final closing delimiter out of
the various show_part functions and putting it into a new
show_part_end function instead. Also, the show_part function now
accepts a new "first" argument that is set not only for the first MIME
part of a message, but also for each first MIME part within a series
of multipart parts. This "first" argument controls the omission of a
preceding comma when printing a part (for json).
Many thanks to David Edmondson <dme@dme.org> for originally
identifying the lack of nesting in the json output and submitting an
early implementation of this feature. Thanks as well to Jameson Graef
Rollins <jrollins@finestructure.net> for carefully shepherding David's
patches through a remarkably long review process, patiently explaining
them, and providing a cleaned up series that led to this final
implementation. Jameson also provided the new emacs code here.
2011-05-18 00:34:57 +02:00
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
if (selected)
|
|
|
|
state->in_zone = 0;
|
|
|
|
|
2011-05-23 07:08:08 +02:00
|
|
|
} else if (GMIME_IS_MESSAGE_PART (part)) {
|
2011-05-24 00:31:32 +02:00
|
|
|
GMimeMessage *mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
|
2009-11-06 19:00:38 +01:00
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
if (selected)
|
|
|
|
state->in_zone = 1;
|
2009-11-06 19:00:38 +01:00
|
|
|
|
|
|
|
show_message_part (g_mime_message_get_mime_part (mime_message),
|
2011-05-24 00:31:32 +02:00
|
|
|
state, format, params, TRUE);
|
|
|
|
|
|
|
|
if (selected)
|
|
|
|
state->in_zone = 0;
|
2009-11-06 19:00:38 +01:00
|
|
|
}
|
|
|
|
|
2011-05-24 00:31:32 +02:00
|
|
|
if (selected || state->in_zone) {
|
|
|
|
if (format->part_end)
|
|
|
|
format->part_end (part);
|
|
|
|
}
|
2009-11-06 19:00:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
notmuch_status_t
|
|
|
|
show_message_body (const char *filename,
|
2011-05-24 00:31:32 +02:00
|
|
|
const notmuch_show_format_t *format,
|
|
|
|
notmuch_show_params_t *params)
|
2009-11-06 19:00:38 +01:00
|
|
|
{
|
|
|
|
GMimeStream *stream = NULL;
|
|
|
|
GMimeParser *parser = NULL;
|
|
|
|
GMimeMessage *mime_message = NULL;
|
|
|
|
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
|
|
|
|
FILE *file = NULL;
|
2011-05-24 00:31:32 +02:00
|
|
|
show_message_state_t state;
|
|
|
|
|
|
|
|
state.part_count = 0;
|
|
|
|
state.in_zone = 0;
|
2009-11-06 19:00:38 +01:00
|
|
|
|
|
|
|
file = fopen (filename, "r");
|
|
|
|
if (! file) {
|
|
|
|
fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
|
|
|
|
ret = NOTMUCH_STATUS_FILE_ERROR;
|
|
|
|
goto DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
stream = g_mime_stream_file_new (file);
|
|
|
|
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
|
|
|
|
|
|
|
|
parser = g_mime_parser_new_with_stream (stream);
|
|
|
|
|
|
|
|
mime_message = g_mime_parser_construct_message (parser);
|
|
|
|
|
|
|
|
show_message_part (g_mime_message_get_mime_part (mime_message),
|
2011-05-24 00:31:32 +02:00
|
|
|
&state,
|
2011-05-20 20:45:33 +02:00
|
|
|
format,
|
2011-05-24 00:31:32 +02:00
|
|
|
params,
|
2011-05-20 20:45:33 +02:00
|
|
|
TRUE);
|
2009-11-06 19:00:38 +01:00
|
|
|
|
|
|
|
DONE:
|
|
|
|
if (mime_message)
|
|
|
|
g_object_unref (mime_message);
|
|
|
|
|
|
|
|
if (parser)
|
|
|
|
g_object_unref (parser);
|
|
|
|
|
|
|
|
if (stream)
|
|
|
|
g_object_unref (stream);
|
|
|
|
|
|
|
|
if (file)
|
|
|
|
fclose (file);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|