debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Break up format->part function into part_start and part_content functions.

Browse source 
Future improvements (eg. crypto support) will require adding new part
header.  By breaking up the output of part headers from the output of
part content, we can easily out new part headers with new formatting
functions.
This commit is contained in:
Jameson Graef Rollins 2011-05-25 18:01:13 -07:00 committed by Carl Worth
parent 757e06f74b
commit d92146d3a6
4 changed files with 86 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
notmuch-client.h
View file

@ -65,8 +65,9 @@ typedef struct notmuch_show_format {
notmuch_message_t *message); notmuch_message_t *message);
const char *header_end; const char *header_end;
const char *body_start; const char *body_start;
void (*part) (GMimeObject *part, void (*part_start) (GMimeObject *part,
int *part_count); int *part_count);
void (*part_content) (GMimeObject *part);
void (*part_end) (GMimeObject *part); void (*part_end) (GMimeObject *part);
const char *part_sep; const char *part_sep;
const char *body_end; const char *body_end;

13
notmuch-reply.c
View file

@ -25,14 +25,18 @@
#include "gmime-filter-headers.h" #include "gmime-filter-headers.h"
static void static void
reply_part (GMimeObject *part, reply_part_content (GMimeObject *part);
unused (int *part_count));
static const notmuch_show_format_t format_reply = { static const notmuch_show_format_t format_reply = {
"", "",
"", NULL, "", NULL,
"", NULL, "", "", NULL, "",
"", reply_part, NULL, "", "", "",
NULL,
reply_part_content,
NULL,
"",
"",
"", "", "", "",
"" ""
}; };
@ -57,8 +61,7 @@ show_reply_headers (GMimeMessage *message)
} }
static void static void
reply_part (GMimeObject *part, reply_part_content (GMimeObject *part)
unused (int *part_count))
{ {
GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part); GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);

124
notmuch-show.c
View file

@ -29,8 +29,11 @@ format_headers_text (const void *ctx,
notmuch_message_t *message); notmuch_message_t *message);
static void static void
format_part_text (GMimeObject *part, format_part_start_text (GMimeObject *part,
int *part_count); int *part_count);
static void
format_part_content_text (GMimeObject *part);
static void static void
format_part_end_text (GMimeObject *part); format_part_end_text (GMimeObject *part);
@ -39,7 +42,12 @@ static const notmuch_show_format_t format_text = {
"", "",
"\fmessage{ ", format_message_text, "\fmessage{ ", format_message_text,
"\fheader{\n", format_headers_text, "\fheader}\n", "\fheader{\n", format_headers_text, "\fheader}\n",
"\fbody{\n", format_part_text, format_part_end_text, "", "\fbody}\n", "\fbody{\n",
format_part_start_text,
format_part_content_text,
format_part_end_text,
"",
"\fbody}\n",
"\fmessage}\n", "", "\fmessage}\n", "",
"" ""
}; };
@ -53,8 +61,11 @@ format_headers_json (const void *ctx,
notmuch_message_t *message); notmuch_message_t *message);
static void static void
format_part_json (GMimeObject *part, format_part_start_json (unused (GMimeObject *part),
int *part_count); int *part_count);
static void
format_part_content_json (GMimeObject *part);
static void static void
format_part_end_json (GMimeObject *part); format_part_end_json (GMimeObject *part);
@ -63,7 +74,12 @@ static const notmuch_show_format_t format_json = {
"[", "[",
"{", format_message_json, "{", format_message_json,
", \"headers\": {", format_headers_json, "}", ", \"headers\": {", format_headers_json, "}",
", \"body\": [", format_part_json, format_part_end_json, ", ", "]", ", \"body\": [",
format_part_start_json,
format_part_content_json,
format_part_end_json,
", ",
"]",
"}", ", ", "}", ", ",
"]" "]"
}; };
@ -77,20 +93,29 @@ static const notmuch_show_format_t format_mbox = {
"", "",
"", format_message_mbox, "", format_message_mbox,
"", NULL, "", "", NULL, "",
"", NULL, NULL, "", "", "",
NULL,
NULL,
NULL,
"",
"",
"", "", "", "",
"" ""
}; };
static void static void
format_part_raw (GMimeObject *part, format_part_content_raw (GMimeObject *part);
unused (int *part_count));
static const notmuch_show_format_t format_raw = { static const notmuch_show_format_t format_raw = {
"", "",
"", NULL, "", NULL,
"", NULL, "", "", NULL, "",
"", format_part_raw, NULL, "", "", "",
NULL,
format_part_content_raw,
NULL,
"",
"",
"", "", "", "",
"" ""
}; };
@ -372,46 +397,41 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out)
} }
static void static void
format_part_text (GMimeObject *part, int *part_count) format_part_start_text (GMimeObject *part, int *part_count)
{ {
GMimeContentDisposition *disposition; GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
GMimeContentType *content_type;
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)
{
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
disposition = g_mime_object_get_content_disposition (part);
if (disposition && if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{ {
const char *filename = g_mime_part_get_filename (GMIME_PART (part)); const char *filename = g_mime_part_get_filename (GMIME_PART (part));
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("\fattachment{ ID: %d, Content-type: %s\n",
*part_count,
g_mime_content_type_to_string (content_type));
printf ("Attachment: %s (%s)\n", filename, printf ("Attachment: %s (%s)\n", filename,
g_mime_content_type_to_string (content_type)); 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_part_content (part, stream_stdout);
g_object_unref(stream_stdout);
}
return;
} }
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
printf ("\fpart{ ID: %d, Content-type: %s\n",
*part_count,
g_mime_content_type_to_string (content_type));
if (g_mime_content_type_is_type (content_type, "text", "*") && if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html")) !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); g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
show_part_content (part, stream_stdout); show_part_content (part, stream_stdout);
g_object_unref(stream_stdout); g_object_unref(stream_stdout);
@ -447,27 +467,27 @@ format_part_end_text (GMimeObject *part)
} }
static void static void
format_part_json (GMimeObject *part, int *part_count) format_part_start_json (unused (GMimeObject *part), int *part_count)
{ {
GMimeContentType *content_type; printf ("{\"id\": %d", *part_count);
GMimeContentDisposition *disposition; }
void *ctx = talloc_new (NULL);
static void
format_part_content_json (GMimeObject *part)
{
GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
GMimeStream *stream_memory = g_mime_stream_mem_new (); GMimeStream *stream_memory = g_mime_stream_mem_new ();
const char *cid = g_mime_object_get_content_id (part);
void *ctx = talloc_new (NULL);
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
GByteArray *part_content; GByteArray *part_content;
const char *cid;
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); printf (", \"content-type\": %s",
printf ("{\"id\": %d, \"content-type\": %s",
*part_count,
json_quote_str (ctx, g_mime_content_type_to_string (content_type))); json_quote_str (ctx, g_mime_content_type_to_string (content_type)));
cid = g_mime_object_get_content_id (part);
if (cid != NULL) if (cid != NULL)
printf(", \"content-id\": %s", printf(", \"content-id\": %s", json_quote_str (ctx, cid));
json_quote_str (ctx, cid));
disposition = g_mime_object_get_content_disposition (part);
if (disposition && if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{ {
@ -510,7 +530,7 @@ format_part_end_json (GMimeObject *part)
} }
static void static void
format_part_raw (GMimeObject *part, unused (int *part_count)) format_part_content_raw (GMimeObject *part)
{ {
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
@ -538,7 +558,7 @@ show_message (void *ctx,
fputs (format->body_start, stdout); fputs (format->body_start, stdout);
} }
if (format->part) if (format->part_content)
show_message_body (notmuch_message_get_filename (message), show_message_body (notmuch_message_get_filename (message),
format, params); format, params);

4
show-message.c
View file

@ -49,7 +49,9 @@ show_message_part (GMimeObject *part,
if (!first && (params->part <= 0 || state->in_zone)) if (!first && (params->part <= 0 || state->in_zone))
fputs (format->part_sep, stdout); fputs (format->part_sep, stdout);
format->part (part, &(state->part_count)); if (format->part_start)
format->part_start (part, &(state->part_count));
format->part_content (part);
} }
if (GMIME_IS_MULTIPART (part)) { if (GMIME_IS_MULTIPART (part)) {