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

cli/show: use a table for choosing the formatter

Browse source 
Continue detangling format pointer and format selection variables. No
functional changes.
This commit is contained in:
Jani Nikula 2017-01-06 22:14:45 +02:00 committed by David Bremner
parent 1232584040
commit 0bb3b3b8e8
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
notmuch-show.c
View file

@ -1007,6 +1007,14 @@ enum {
NOTMUCH_FORMAT_RAW NOTMUCH_FORMAT_RAW
}; };
static const notmuch_show_format_t *formatters[] = {
[NOTMUCH_FORMAT_JSON] = &format_json,
[NOTMUCH_FORMAT_SEXP] = &format_sexp,
[NOTMUCH_FORMAT_TEXT] = &format_text,
[NOTMUCH_FORMAT_MBOX] = &format_mbox,
[NOTMUCH_FORMAT_RAW] = &format_raw,
};
enum { enum {
ENTIRE_THREAD_DEFAULT, ENTIRE_THREAD_DEFAULT,
ENTIRE_THREAD_TRUE, ENTIRE_THREAD_TRUE,
@ -1026,7 +1034,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
notmuch_query_t *query; notmuch_query_t *query;
char *query_string; char *query_string;
int opt_index, ret; int opt_index, ret;
const notmuch_show_format_t *format = &format_text; const notmuch_show_format_t *formatter;
sprinter_t *sprinter; sprinter_t *sprinter;
notmuch_show_params_t params = { notmuch_show_params_t params = {
.part = -1, .part = -1,
@ -1092,29 +1100,14 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
format_sel = NOTMUCH_FORMAT_TEXT; format_sel = NOTMUCH_FORMAT_TEXT;
} }
switch (format_sel) { if (format_sel == NOTMUCH_FORMAT_MBOX) {
case NOTMUCH_FORMAT_JSON:
format = &format_json;
break;
case NOTMUCH_FORMAT_TEXT:
format = &format_text;
break;
case NOTMUCH_FORMAT_SEXP:
format = &format_sexp;
break;
case NOTMUCH_FORMAT_MBOX:
if (params.part > 0) { if (params.part > 0) {
fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} else if (format_sel == NOTMUCH_FORMAT_RAW) {
format = &format_mbox;
break;
case NOTMUCH_FORMAT_RAW:
format = &format_raw;
/* raw format only supports single message display */ /* raw format only supports single message display */
single_message = TRUE; single_message = TRUE;
break;
} }
notmuch_exit_if_unsupported_format (); notmuch_exit_if_unsupported_format ();
@ -1177,11 +1170,12 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
} }
/* Create structure printer. */ /* Create structure printer. */
sprinter = format->new_sprinter(config, stdout); formatter = formatters[format_sel];
sprinter = formatter->new_sprinter(config, stdout);
/* 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 (single_message) { if (single_message) {
ret = do_show_single (config, query, format, sprinter, &params); ret = do_show_single (config, query, formatter, 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
@ -1200,7 +1194,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
params.omit_excluded = FALSE; params.omit_excluded = FALSE;
} }
ret = do_show (config, query, format, sprinter, &params); ret = do_show (config, query, formatter, sprinter, &params);
} }
notmuch_crypto_cleanup (&params.crypto); notmuch_crypto_cleanup (&params.crypto);