const char *item_sep;
const char *item_end;
const char *results_end;
+ const char *results_null;
} search_format_t;
static void
")", "\n",
"",
"\n",
+ "",
};
static void
"]", ",\n",
"}",
"]\n",
+ "]\n",
};
static void
printf ("%s%s", item_type, item_id);
}
+static char *
+sanitize_string (const void *ctx, const char *str)
+{
+ char *out, *loop;
+
+ if (NULL == str)
+ return NULL;
+
+ loop = out = talloc_strdup (ctx, str);
+
+ for (; *loop; loop++) {
+ if ((unsigned char)(*loop) < 32)
+ *loop = '?';
+ }
+ return out;
+}
+
static void
format_thread_text (const void *ctx,
const char *thread_id,
const char *authors,
const char *subject)
{
+ void *ctx_quote = talloc_new (ctx);
+
printf ("thread:%s %12s [%d/%d] %s; %s",
thread_id,
notmuch_time_relative_date (ctx, date),
matched,
total,
- authors,
- subject);
+ sanitize_string (ctx_quote, authors),
+ sanitize_string (ctx_quote, subject));
+
+ talloc_free (ctx_quote);
}
static void
printf ("\"thread\": %s,\n"
"\"timestamp\": %ld,\n"
+ "\"date_relative\": \"%s\",\n"
"\"matched\": %d,\n"
"\"total\": %d,\n"
"\"authors\": %s,\n"
"\"subject\": %s,\n",
json_quote_str (ctx_quote, thread_id),
date,
+ notmuch_time_relative_date (ctx, date),
matched,
total,
json_quote_str (ctx_quote, authors),
}
static int
-do_search_threads (const void *ctx,
- const search_format_t *format,
+do_search_threads (const search_format_t *format,
notmuch_query_t *query,
notmuch_sort_t sort,
- output_t output)
+ output_t output,
+ int offset,
+ int limit)
{
notmuch_thread_t *thread;
notmuch_threads_t *threads;
notmuch_tags_t *tags;
time_t date;
int first_thread = 1;
+ int i;
+
+ if (offset < 0) {
+ offset += notmuch_query_count_threads (query);
+ if (offset < 0)
+ offset = 0;
+ }
threads = notmuch_query_search_threads (query);
if (threads == NULL)
return 1;
- for (;
- notmuch_threads_valid (threads);
- notmuch_threads_move_to_next (threads))
+ fputs (format->results_start, stdout);
+
+ for (i = 0;
+ notmuch_threads_valid (threads) && (limit < 0 || i < offset + limit);
+ notmuch_threads_move_to_next (threads), i++)
{
int first_tag = 1;
- if (first_thread)
- fputs (format->results_start, stdout);
- else
- fputs (format->item_sep, stdout);
-
thread = notmuch_threads_get (threads);
+ if (i < offset) {
+ notmuch_thread_destroy (thread);
+ continue;
+ }
+
+ if (! first_thread)
+ fputs (format->item_sep, stdout);
+
if (output == OUTPUT_THREADS) {
- format->item_id (ctx, "thread:",
+ format->item_id (thread, "thread:",
notmuch_thread_get_thread_id (thread));
} else { /* output == OUTPUT_SUMMARY */
fputs (format->item_start, stdout);
else
date = notmuch_thread_get_newest_date (thread);
- format->thread_summary (ctx,
+ format->thread_summary (thread,
notmuch_thread_get_thread_id (thread),
date,
notmuch_thread_get_matched_messages (thread),
notmuch_thread_destroy (thread);
}
- if (! first_thread)
+ if (first_thread)
+ fputs (format->results_null, stdout);
+ else
fputs (format->results_end, stdout);
return 0;
}
static int
-do_search_messages (const void *ctx,
- const search_format_t *format,
+do_search_messages (const search_format_t *format,
notmuch_query_t *query,
- output_t output)
+ output_t output,
+ int offset,
+ int limit)
{
notmuch_message_t *message;
notmuch_messages_t *messages;
+ notmuch_filenames_t *filenames;
int first_message = 1;
+ int i;
+
+ if (offset < 0) {
+ offset += notmuch_query_count_messages (query);
+ if (offset < 0)
+ offset = 0;
+ }
messages = notmuch_query_search_messages (query);
if (messages == NULL)
return 1;
- for (;
- notmuch_messages_valid (messages);
- notmuch_messages_move_to_next (messages))
+ fputs (format->results_start, stdout);
+
+ for (i = 0;
+ notmuch_messages_valid (messages) && (limit < 0 || i < offset + limit);
+ notmuch_messages_move_to_next (messages), i++)
{
- message = notmuch_messages_get (messages);
+ if (i < offset)
+ continue;
- if (first_message)
- fputs (format->results_start, stdout);
- else
- fputs (format->item_sep, stdout);
+ message = notmuch_messages_get (messages);
if (output == OUTPUT_FILES) {
- format->item_id (ctx, "",
- notmuch_message_get_filename (message));
+ filenames = notmuch_message_get_filenames (message);
+
+ for (;
+ notmuch_filenames_valid (filenames);
+ notmuch_filenames_move_to_next (filenames))
+ {
+ if (! first_message)
+ fputs (format->item_sep, stdout);
+
+ format->item_id (message, "",
+ notmuch_filenames_get (filenames));
+
+ first_message = 0;
+ }
+
+ notmuch_filenames_destroy( filenames );
+
} else { /* output == OUTPUT_MESSAGES */
- format->item_id (ctx, "id:",
+ if (! first_message)
+ fputs (format->item_sep, stdout);
+
+ format->item_id (message, "id:",
notmuch_message_get_message_id (message));
+ first_message = 0;
}
- first_message = 0;
-
notmuch_message_destroy (message);
}
notmuch_messages_destroy (messages);
- if (! first_message)
+ if (first_message)
+ fputs (format->results_null, stdout);
+ else
fputs (format->results_end, stdout);
return 0;
}
static int
-do_search_tags (const void *ctx,
- notmuch_database_t *notmuch,
+do_search_tags (notmuch_database_t *notmuch,
const search_format_t *format,
notmuch_query_t *query)
{
if (tags == NULL)
return 1;
+ fputs (format->results_start, stdout);
+
for (;
notmuch_tags_valid (tags);
notmuch_tags_move_to_next (tags))
if (! first_tag)
fputs (format->item_sep, stdout);
- format->item_id (ctx, "", tag);
+ format->item_id (tags, "", tag);
first_tag = 0;
}
if (messages)
notmuch_messages_destroy (messages);
+ if (first_tag)
+ fputs (format->results_null, stdout);
+ else
+ fputs (format->results_end, stdout);
+
return 0;
}
notmuch_database_t *notmuch;
notmuch_query_t *query;
char *query_str;
- char *opt;
notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
const search_format_t *format = &format_text;
- int i, ret;
+ int opt_index, ret;
output_t output = OUTPUT_SUMMARY;
-
- for (i = 0; i < argc && argv[i][0] == '-'; i++) {
- if (strcmp (argv[i], "--") == 0) {
- i++;
- break;
- }
- if (STRNCMP_LITERAL (argv[i], "--sort=") == 0) {
- opt = argv[i] + sizeof ("--sort=") - 1;
- if (strcmp (opt, "oldest-first") == 0) {
- sort = NOTMUCH_SORT_OLDEST_FIRST;
- } else if (strcmp (opt, "newest-first") == 0) {
- sort = NOTMUCH_SORT_NEWEST_FIRST;
- } else {
- fprintf (stderr, "Invalid value for --sort: %s\n", opt);
- return 1;
- }
- } else if (STRNCMP_LITERAL (argv[i], "--format=") == 0) {
- opt = argv[i] + sizeof ("--format=") - 1;
- if (strcmp (opt, "text") == 0) {
- format = &format_text;
- } else if (strcmp (opt, "json") == 0) {
- format = &format_json;
- } else {
- fprintf (stderr, "Invalid value for --format: %s\n", opt);
- return 1;
- }
- } else if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {
- opt = argv[i] + sizeof ("--output=") - 1;
- if (strcmp (opt, "summary") == 0) {
- output = OUTPUT_SUMMARY;
- } else if (strcmp (opt, "threads") == 0) {
- output = OUTPUT_THREADS;
- } else if (strcmp (opt, "messages") == 0) {
- output = OUTPUT_MESSAGES;
- } else if (strcmp (opt, "files") == 0) {
- output = OUTPUT_FILES;
- } else if (strcmp (opt, "tags") == 0) {
- output = OUTPUT_TAGS;
- } else {
- fprintf (stderr, "Invalid value for --output: %s\n", opt);
- return 1;
- }
- } else {
- fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
- return 1;
- }
+ int offset = 0;
+ int limit = -1; /* unlimited */
+ const char **search_exclude_tags;
+ size_t search_exclude_tags_length;
+ unsigned int i;
+
+ enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }
+ format_sel = NOTMUCH_FORMAT_TEXT;
+
+ notmuch_opt_desc_t options[] = {
+ { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',
+ (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },
+ { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },
+ { 0, 0 } } },
+ { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',
+ (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },
+ { "text", NOTMUCH_FORMAT_TEXT },
+ { 0, 0 } } },
+ { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
+ (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY },
+ { "threads", OUTPUT_THREADS },
+ { "messages", OUTPUT_MESSAGES },
+ { "files", OUTPUT_FILES },
+ { "tags", OUTPUT_TAGS },
+ { 0, 0 } } },
+ { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },
+ { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },
+ { 0, 0, 0, 0, 0 }
+ };
+
+ opt_index = parse_arguments (argc, argv, options, 1);
+
+ if (opt_index < 0) {
+ return 1;
}
- argc -= i;
- argv += i;
+ switch (format_sel) {
+ case NOTMUCH_FORMAT_TEXT:
+ format = &format_text;
+ break;
+ case NOTMUCH_FORMAT_JSON:
+ format = &format_json;
+ break;
+ }
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
if (notmuch == NULL)
return 1;
- query_str = query_string_from_args (ctx, argc, argv);
+ query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index);
if (query_str == NULL) {
fprintf (stderr, "Out of memory.\n");
return 1;
notmuch_query_set_sort (query, sort);
+ search_exclude_tags = notmuch_config_get_search_exclude_tags
+ (config, &search_exclude_tags_length);
+ for (i = 0; i < search_exclude_tags_length; i++)
+ notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
+
switch (output) {
default:
case OUTPUT_SUMMARY:
case OUTPUT_THREADS:
- ret = do_search_threads (ctx, format, query, sort, output);
+ ret = do_search_threads (format, query, sort, output, offset, limit);
break;
case OUTPUT_MESSAGES:
case OUTPUT_FILES:
- ret = do_search_messages (ctx, format, query, output);
+ ret = do_search_messages (format, query, output, offset, limit);
break;
case OUTPUT_TAGS:
- ret = do_search_tags (ctx, notmuch, format, query);
+ ret = do_search_tags (notmuch, format, query);
break;
}
projects / notmuch / blobdiff