debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

show: Feed the sprinter down to part formatters

Browse source 
There are several levels of function calls between where we create the
sprinter and the call to the part formatter in show_message. This
feeds the sprinter through all of them and into the part formatters.
This commit is contained in:
Austin Clements 2012-08-02 21:14:52 -04:00 committed by David Bremner
parent 7b2c4481f1
commit 3a08341e50
3 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
notmuch-client.h
View file

@ -66,12 +66,13 @@ typedef GMimeCipherContext notmuch_crypto_context_t;
#define STRINGIFY_(s) #s #define STRINGIFY_(s) #s
typedef struct mime_node mime_node_t; typedef struct mime_node mime_node_t;
struct sprinter;
struct notmuch_show_params; struct notmuch_show_params;
typedef struct notmuch_show_format { typedef struct notmuch_show_format {
struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream); struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream);
const char *message_set_start; const char *message_set_start;
notmuch_status_t (*part) (const void *ctx, notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter,
struct mime_node *node, int indent, struct mime_node *node, int indent,
const struct notmuch_show_params *params); const struct notmuch_show_params *params);
const char *message_set_sep; const char *message_set_sep;
@ -178,7 +179,8 @@ notmuch_status_t
show_one_part (const char *filename, int part); show_one_part (const char *filename, int part);
void void
format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notmuch_bool_t output_body); format_part_json (const void *ctx, struct sprinter *sp, mime_node_t *node,
notmuch_bool_t first, notmuch_bool_t output_body);
void void
format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply); format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply);

2
notmuch-reply.c
View file

@ -624,7 +624,7 @@ notmuch_reply_format_json(void *ctx,
/* Start the original */ /* Start the original */
printf (", \"original\": "); printf (", \"original\": ");
format_part_json (ctx, node, TRUE, TRUE); format_part_json (ctx, sp, node, TRUE, TRUE);
/* End */ /* End */
printf ("}\n"); printf ("}\n");

50
notmuch-show.c
View file

@ -23,7 +23,7 @@
#include "sprinter.h" #include "sprinter.h"
static notmuch_status_t static notmuch_status_t
format_part_text (const void *ctx, mime_node_t *node, format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
int indent, const notmuch_show_params_t *params); int indent, const notmuch_show_params_t *params);
static const notmuch_show_format_t format_text = { static const notmuch_show_format_t format_text = {
@ -32,7 +32,7 @@ static const notmuch_show_format_t format_text = {
}; };
static notmuch_status_t static notmuch_status_t
format_part_json_entry (const void *ctx, mime_node_t *node, format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node,
int indent, const notmuch_show_params_t *params); int indent, const notmuch_show_params_t *params);
static const notmuch_show_format_t format_json = { static const notmuch_show_format_t format_json = {
@ -45,7 +45,7 @@ static const notmuch_show_format_t format_json = {
}; };
static notmuch_status_t static notmuch_status_t
format_part_mbox (const void *ctx, mime_node_t *node, format_part_mbox (const void *ctx, sprinter_t *sp, mime_node_t *node,
int indent, const notmuch_show_params_t *params); int indent, const notmuch_show_params_t *params);
static const notmuch_show_format_t format_mbox = { static const notmuch_show_format_t format_mbox = {
@ -54,7 +54,7 @@ static const notmuch_show_format_t format_mbox = {
}; };
static notmuch_status_t static notmuch_status_t
format_part_raw (unused (const void *ctx), mime_node_t *node, format_part_raw (unused (const void *ctx), sprinter_t *sp, mime_node_t *node,
unused (int indent), unused (int indent),
unused (const notmuch_show_params_t *params)); unused (const notmuch_show_params_t *params));
@ -471,7 +471,7 @@ format_part_sigstatus_json (mime_node_t *node)
#endif #endif
static notmuch_status_t static notmuch_status_t
format_part_text (const void *ctx, mime_node_t *node, format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
int indent, const notmuch_show_params_t *params) int indent, const notmuch_show_params_t *params)
{ {
/* The disposition and content-type metadata are associated with /* The disposition and content-type metadata are associated with
@ -553,7 +553,7 @@ format_part_text (const void *ctx, mime_node_t *node,
} }
for (i = 0; i < node->nchildren; i++) for (i = 0; i < node->nchildren; i++)
format_part_text (ctx, mime_node_child (node, i), indent, params); format_part_text (ctx, sp, mime_node_child (node, i), indent, params);
if (GMIME_IS_MESSAGE (node->part)) if (GMIME_IS_MESSAGE (node->part))
printf ("\fbody}\n"); printf ("\fbody}\n");
@ -564,7 +564,8 @@ format_part_text (const void *ctx, mime_node_t *node,
} }
void void
format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notmuch_bool_t output_body) format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,
notmuch_bool_t first, notmuch_bool_t output_body)
{ {
/* Any changes to the JSON format should be reflected in the file /* Any changes to the JSON format should be reflected in the file
* devel/schemata. */ * devel/schemata. */
@ -578,7 +579,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notm
if (output_body) { if (output_body) {
printf (", \"body\": ["); printf (", \"body\": [");
format_part_json (ctx, mime_node_child (node, 0), first, TRUE); format_part_json (ctx, sp, mime_node_child (node, 0), first, TRUE);
printf ("]"); printf ("]");
} }
printf ("}"); printf ("}");
@ -659,16 +660,17 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notm
talloc_free (local); talloc_free (local);
for (i = 0; i < node->nchildren; i++) for (i = 0; i < node->nchildren; i++)
format_part_json (ctx, mime_node_child (node, i), i == 0, TRUE); format_part_json (ctx, sp, mime_node_child (node, i), i == 0, TRUE);
printf ("%s}", terminator); printf ("%s}", terminator);
} }
static notmuch_status_t static notmuch_status_t
format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent), format_part_json_entry (const void *ctx, sprinter_t *sp,
mime_node_t *node, unused (int indent),
const notmuch_show_params_t *params) const notmuch_show_params_t *params)
{ {
format_part_json (ctx, node, TRUE, params->output_body); format_part_json (ctx, sp, node, TRUE, params->output_body);
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }
@ -679,7 +681,8 @@ format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent),
* http://qmail.org/qmail-manual-html/man5/mbox.html * http://qmail.org/qmail-manual-html/man5/mbox.html
*/ */
static notmuch_status_t static notmuch_status_t
format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent), format_part_mbox (const void *ctx, unused (sprinter_t *sp), mime_node_t *node,
unused (int indent),
unused (const notmuch_show_params_t *params)) unused (const notmuch_show_params_t *params))
{ {
notmuch_message_t *message = node->envelope_file; notmuch_message_t *message = node->envelope_file;
@ -730,8 +733,8 @@ format_part_mbox (const void *ctx, mime_node_t *node, unused (int indent),
} }
static notmuch_status_t static notmuch_status_t
format_part_raw (unused (const void *ctx), mime_node_t *node, format_part_raw (unused (const void *ctx), unused (sprinter_t *sp),
unused (int indent), mime_node_t *node, unused (int indent),
unused (const notmuch_show_params_t *params)) unused (const notmuch_show_params_t *params))
{ {
if (node->envelope_file) { if (node->envelope_file) {
@ -819,6 +822,7 @@ show_null_message (const notmuch_show_format_t *format)
static notmuch_status_t static notmuch_status_t
show_message (void *ctx, show_message (void *ctx,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
sprinter_t *sp,
notmuch_message_t *message, notmuch_message_t *message,
int indent, int indent,
notmuch_show_params_t *params) notmuch_show_params_t *params)
@ -832,7 +836,7 @@ show_message (void *ctx,
goto DONE; goto DONE;
part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
if (part) if (part)
status = format->part (local, part, indent, params); status = format->part (local, sp, part, indent, params);
DONE: DONE:
talloc_free (local); talloc_free (local);
return status; return status;
@ -841,6 +845,7 @@ show_message (void *ctx,
static notmuch_status_t static notmuch_status_t
show_messages (void *ctx, show_messages (void *ctx,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
sprinter_t *sp,
notmuch_messages_t *messages, notmuch_messages_t *messages,
int indent, int indent,
notmuch_show_params_t *params) notmuch_show_params_t *params)
@ -874,7 +879,7 @@ show_messages (void *ctx,
next_indent = indent; next_indent = indent;
if ((match && (!excluded || !params->omit_excluded)) || params->entire_thread) { if ((match && (!excluded || !params->omit_excluded)) || params->entire_thread) {
status = show_message (ctx, format, message, indent, params); status = show_message (ctx, format, sp, message, indent, params);
if (status && !res) if (status && !res)
res = status; res = status;
next_indent = indent + 1; next_indent = indent + 1;
@ -886,7 +891,7 @@ show_messages (void *ctx,
fputs (format->message_set_sep, stdout); fputs (format->message_set_sep, stdout);
status = show_messages (ctx, status = show_messages (ctx,
format, format, sp,
notmuch_message_get_replies (message), notmuch_message_get_replies (message),
next_indent, next_indent,
params); params);
@ -910,6 +915,7 @@ static int
do_show_single (void *ctx, do_show_single (void *ctx,
notmuch_query_t *query, notmuch_query_t *query,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
sprinter_t *sp,
notmuch_show_params_t *params) notmuch_show_params_t *params)
{ {
notmuch_messages_t *messages; notmuch_messages_t *messages;
@ -930,7 +936,8 @@ do_show_single (void *ctx,
notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1); notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);
return show_message (ctx, format, message, 0, params) != NOTMUCH_STATUS_SUCCESS; return show_message (ctx, format, sp, message, 0, params)
!= NOTMUCH_STATUS_SUCCESS;
} }
/* Formatted output of threads */ /* Formatted output of threads */
@ -938,6 +945,7 @@ static int
do_show (void *ctx, do_show (void *ctx,
notmuch_query_t *query, notmuch_query_t *query,
const notmuch_show_format_t *format, const notmuch_show_format_t *format,
sprinter_t *sp,
notmuch_show_params_t *params) notmuch_show_params_t *params)
{ {
notmuch_threads_t *threads; notmuch_threads_t *threads;
@ -965,7 +973,7 @@ do_show (void *ctx,
fputs (format->message_set_sep, stdout); fputs (format->message_set_sep, stdout);
first_toplevel = 0; first_toplevel = 0;
status = show_messages (ctx, format, messages, 0, params); status = show_messages (ctx, format, sp, messages, 0, params);
if (status && !res) if (status && !res)
res = status; res = status;
@ -1141,7 +1149,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
/* If a single message is requested we do not use search_excludes. */ /* If a single message is requested we do not use search_excludes. */
if (params.part >= 0) if (params.part >= 0)
ret = do_show_single (ctx, query, format, &params); ret = do_show_single (ctx, query, format, sprinter, &params);
else { else {
/* We always apply set the exclude flag. The /* We always apply set the exclude flag. The
* exclude=true|false option controls whether or not we return * exclude=true|false option controls whether or not we return
@ -1160,7 +1168,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
params.omit_excluded = FALSE; params.omit_excluded = FALSE;
} }
ret = do_show (ctx, query, format, &params); ret = do_show (ctx, query, format, sprinter, &params);
} }
notmuch_crypto_cleanup (&params.crypto); notmuch_crypto_cleanup (&params.crypto);