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

cli: search: Move more variables into search_context_t

Browse source 
In order to share some command line options between search and address
subcommands we need to add corresponding variables to the context
structure. While we are at it, we also add notmuch_database_t to unify
parameters of all do_search_* functions and to simplify subsequent
commits.

Otherwise, there are no functional changes.
This commit is contained in:
Michal Sojka 2014-11-05 01:25:51 +01:00 committed by David Bremner
parent 15d39e424e
commit 33f9109fd3
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
notmuch-search.c
View file

@ -34,8 +34,18 @@ typedef enum {
#define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS) #define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS)
typedef enum {
NOTMUCH_FORMAT_JSON,
NOTMUCH_FORMAT_TEXT,
NOTMUCH_FORMAT_TEXT0,
NOTMUCH_FORMAT_SEXP
} format_sel_t;
typedef struct { typedef struct {
notmuch_database_t *notmuch;
format_sel_t format_sel;
sprinter_t *format; sprinter_t *format;
notmuch_exclude_t exclude;
notmuch_query_t *query; notmuch_query_t *query;
notmuch_sort_t sort; notmuch_sort_t sort;
output_t output; output_t output;
@ -413,14 +423,14 @@ do_search_messages (search_context_t *ctx)
} }
static int static int
do_search_tags (notmuch_database_t *notmuch, do_search_tags (const search_context_t *ctx)
const search_context_t *ctx)
{ {
notmuch_messages_t *messages = NULL; notmuch_messages_t *messages = NULL;
notmuch_tags_t *tags; notmuch_tags_t *tags;
const char *tag; const char *tag;
sprinter_t *format = ctx->format; sprinter_t *format = ctx->format;
notmuch_query_t *query = ctx->query; notmuch_query_t *query = ctx->query;
notmuch_database_t *notmuch = ctx->notmuch;
/* should the following only special case if no excluded terms /* should the following only special case if no excluded terms
* specified? */ * specified? */
@ -464,8 +474,9 @@ do_search_tags (notmuch_database_t *notmuch,
int int
notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
{ {
notmuch_database_t *notmuch;
search_context_t ctx = { search_context_t ctx = {
.format_sel = NOTMUCH_FORMAT_TEXT,
.exclude = NOTMUCH_EXCLUDE_TRUE,
.sort = NOTMUCH_SORT_NEWEST_FIRST, .sort = NOTMUCH_SORT_NEWEST_FIRST,
.output = 0, .output = 0,
.offset = 0, .offset = 0,
@ -474,22 +485,14 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
}; };
char *query_str; char *query_str;
int opt_index, ret; int opt_index, ret;
notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE;
unsigned int i; unsigned int i;
enum {
NOTMUCH_FORMAT_JSON,
NOTMUCH_FORMAT_TEXT,
NOTMUCH_FORMAT_TEXT0,
NOTMUCH_FORMAT_SEXP
} format_sel = NOTMUCH_FORMAT_TEXT;
notmuch_opt_desc_t options[] = { notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_KEYWORD, &ctx.sort, "sort", 's', { NOTMUCH_OPT_KEYWORD, &ctx.sort, "sort", 's',
(notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },
{ "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', { NOTMUCH_OPT_KEYWORD, &ctx.format_sel, "format", 'f',
(notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },
{ "sexp", NOTMUCH_FORMAT_SEXP }, { "sexp", NOTMUCH_FORMAT_SEXP },
{ "text", NOTMUCH_FORMAT_TEXT }, { "text", NOTMUCH_FORMAT_TEXT },
@ -505,7 +508,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
{ "files", OUTPUT_FILES }, { "files", OUTPUT_FILES },
{ "tags", OUTPUT_TAGS }, { "tags", OUTPUT_TAGS },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', { NOTMUCH_OPT_KEYWORD, &ctx.exclude, "exclude", 'x',
(notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },
{ "false", NOTMUCH_EXCLUDE_FALSE }, { "false", NOTMUCH_EXCLUDE_FALSE },
{ "flag", NOTMUCH_EXCLUDE_FLAG }, { "flag", NOTMUCH_EXCLUDE_FLAG },
@ -530,7 +533,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
switch (format_sel) { switch (ctx.format_sel) {
case NOTMUCH_FORMAT_TEXT: case NOTMUCH_FORMAT_TEXT:
ctx.format = sprinter_text_create (config, stdout); ctx.format = sprinter_text_create (config, stdout);
break; break;
@ -555,10 +558,10 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
notmuch_exit_if_unsupported_format (); notmuch_exit_if_unsupported_format ();
if (notmuch_database_open (notmuch_config_get_database_path (config), if (notmuch_database_open (notmuch_config_get_database_path (config),
NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch)) NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx.notmuch))
return EXIT_FAILURE; return EXIT_FAILURE;
query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index); query_str = query_string_from_args (ctx.notmuch, argc-opt_index, argv+opt_index);
if (query_str == NULL) { if (query_str == NULL) {
fprintf (stderr, "Out of memory.\n"); fprintf (stderr, "Out of memory.\n");
return EXIT_FAILURE; return EXIT_FAILURE;
@ -568,7 +571,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
ctx.query = notmuch_query_create (notmuch, query_str); ctx.query = notmuch_query_create (ctx.notmuch, query_str);
if (ctx.query == NULL) { if (ctx.query == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");
return EXIT_FAILURE; return EXIT_FAILURE;
@ -576,15 +579,15 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
notmuch_query_set_sort (ctx.query, ctx.sort); notmuch_query_set_sort (ctx.query, ctx.sort);
if (exclude == NOTMUCH_EXCLUDE_FLAG && ctx.output != OUTPUT_SUMMARY) { if (ctx.exclude == NOTMUCH_EXCLUDE_FLAG && ctx.output != OUTPUT_SUMMARY) {
/* If we are not doing summary output there is nowhere to /* If we are not doing summary output there is nowhere to
* print the excluded flag so fall back on including the * print the excluded flag so fall back on including the
* excluded messages. */ * excluded messages. */
fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n"); fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n");
exclude = NOTMUCH_EXCLUDE_FALSE; ctx.exclude = NOTMUCH_EXCLUDE_FALSE;
} }
if (exclude != NOTMUCH_EXCLUDE_FALSE) { if (ctx.exclude != NOTMUCH_EXCLUDE_FALSE) {
const char **search_exclude_tags; const char **search_exclude_tags;
size_t search_exclude_tags_length; size_t search_exclude_tags_length;
@ -592,7 +595,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
(config, &search_exclude_tags_length); (config, &search_exclude_tags_length);
for (i = 0; i < search_exclude_tags_length; i++) for (i = 0; i < search_exclude_tags_length; i++)
notmuch_query_add_tag_exclude (ctx.query, search_exclude_tags[i]); notmuch_query_add_tag_exclude (ctx.query, search_exclude_tags[i]);
notmuch_query_set_omit_excluded (ctx.query, exclude); notmuch_query_set_omit_excluded (ctx.query, ctx.exclude);
} }
if (ctx.output == OUTPUT_SUMMARY || if (ctx.output == OUTPUT_SUMMARY ||
@ -603,14 +606,14 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
(ctx.output & OUTPUT_ADDRESS_FLAGS && !(ctx.output & ~OUTPUT_ADDRESS_FLAGS))) (ctx.output & OUTPUT_ADDRESS_FLAGS && !(ctx.output & ~OUTPUT_ADDRESS_FLAGS)))
ret = do_search_messages (&ctx); ret = do_search_messages (&ctx);
else if (ctx.output == OUTPUT_TAGS) else if (ctx.output == OUTPUT_TAGS)
ret = do_search_tags (notmuch, &ctx); ret = do_search_tags (&ctx);
else { else {
fprintf (stderr, "Error: the combination of outputs is not supported.\n"); fprintf (stderr, "Error: the combination of outputs is not supported.\n");
ret = 1; ret = 1;
} }
notmuch_query_destroy (ctx.query); notmuch_query_destroy (ctx.query);
notmuch_database_destroy (notmuch); notmuch_database_destroy (ctx.notmuch);
talloc_free (ctx.format); talloc_free (ctx.format);