debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

show: Introduce mime_node formatter callback

Browse source 
This callback is the gateway to the new mime_node_t-based formatters.
This maintains backwards compatibility so the formatters can be
transitioned one at a time.  Once all formatters are converted, the
formatter structure can be reduced to only message_set_{start,sep,end}
and part, most of show_message can be deleted, and all of
show-message.c can be deleted.
This commit is contained in:
Austin Clements 2012-01-23 18:33:10 -05:00 committed by David Bremner
parent a66e65d604
commit 7430a42e23
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
notmuch-client.h
View file

@ -62,8 +62,14 @@
#define STRINGIFY(s) STRINGIFY_(s)
#define STRINGIFY_(s) #s
struct mime_node;
struct notmuch_show_params;
typedef struct notmuch_show_format {
const char *message_set_start;
void (*part) (const void *ctx,
struct mime_node *node, int indent,
const struct notmuch_show_params *params);
const char *message_start;
void (*message) (const void *ctx,
notmuch_message_t *message,

2
notmuch-reply.c
View file

@ -31,7 +31,7 @@ static void
reply_part_content (GMimeObject *part);
static const notmuch_show_format_t format_reply = {
"",
"", NULL,
"", NULL,
"", NULL, reply_headers_message_part, ">\n",
"",

21
notmuch-show.c
View file

@ -42,7 +42,7 @@ static void
format_part_end_text (GMimeObject *part);
static const notmuch_show_format_t format_text = {
"",
"", NULL,
"\fmessage{ ", format_message_text,
"\fheader{\n", format_headers_text, format_headers_message_part_text, "\fheader}\n",
"\fbody{\n",
@ -89,7 +89,7 @@ static void
format_part_end_json (GMimeObject *part);
static const notmuch_show_format_t format_json = {
"[",
"[", NULL,
"{", format_message_json,
"\"headers\": {", format_headers_json, format_headers_message_part_json, "}",
", \"body\": [",
@ -110,7 +110,7 @@ format_message_mbox (const void *ctx,
unused (int indent));
static const notmuch_show_format_t format_mbox = {
"",
"", NULL,
"", format_message_mbox,
"", NULL, NULL, "",
"",
@ -129,7 +129,7 @@ static void
format_part_content_raw (GMimeObject *part);
static const notmuch_show_format_t format_raw = {
"",
"", NULL,
"", NULL,
"", NULL, format_headers_message_part_text, "\n",
"",
@ -850,6 +850,19 @@ show_message (void *ctx,
int indent,
notmuch_show_params_t *params)
{
if (format->part) {
void *local = talloc_new (ctx);
mime_node_t *root, *part;
if (mime_node_open (local, message, params->cryptoctx, params->decrypt,
&root) == NOTMUCH_STATUS_SUCCESS &&
(part = mime_node_seek_dfs (root, (params->part < 0 ?
0 : params->part))))
format->part (local, part, indent, params);
talloc_free (local);
return;
}
if (params->part <= 0) {
fputs (format->message_start, stdout);
if (format->message)