#include "notmuch-client.h"
-/* If the user asks for a *lot* of threads, lets give some results as
- * quickly as possible and let the user read those while we compute
- * the remainder. */
-#define NOTMUCH_SHOW_INITIAL_BURST 100
-
-static void
+/* If the user asks for more than this number of threads, then break
+ the results down into chunks so that results start appearing
+ quickly rather than the user having to wait until all results are
+ available before anything appears.
+
+ Since each subsequent chunk ends up having to re-do threading work
+ done by all previous chunks, we double the chunk size repeatedly
+ until all desired results have been returned.
+*/
+#define NOTMUCH_SEARCH_INITIAL_CHUNK_SIZE 100
+
+/* Do the actual search for a chunk of threads and display the results,
+ (returning the number of threads found in this chunk). */
+static int
do_search_threads (const void *ctx,
notmuch_query_t *query,
notmuch_sort_t sort,
notmuch_tags_t *tags;
time_t date;
const char *relative_date;
+ int num_threads = 0;
for (threads = notmuch_query_search_threads (query, first, max_threads);
notmuch_threads_has_more (threads);
int first_tag = 1;
thread = notmuch_threads_get (threads);
+ num_threads++;
- if (sort == NOTMUCH_SORT_DATE)
+ if (sort == NOTMUCH_SORT_OLDEST_FIRST)
date = notmuch_thread_get_oldest_date (thread);
else
date = notmuch_thread_get_newest_date (thread);
notmuch_thread_destroy (thread);
}
+
+ return num_threads;
}
int
char *query_str;
int i, first = 0, max_threads = -1;
char *opt, *end;
- notmuch_sort_t sort = NOTMUCH_SORT_DATE;
+ notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
+ int chunk_size;
+ int threads_in_chunk;
for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (strcmp (argv[i], "--") == 0) {
fprintf (stderr, "Invalid value for --max-threads: %s\n", opt);
return 1;
}
- } else if (strcmp (argv[i], "--reverse") == 0) {
- sort = NOTMUCH_SORT_DATE_REVERSE;
+ } else 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 {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1;
if (config == NULL)
return 1;
- notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
+ notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+ NOTMUCH_DATABASE_MODE_READ_ONLY);
if (notmuch == NULL)
return 1;
query_str = query_string_from_args (ctx, argc, argv);
if (query_str == NULL) {
- fprintf (stderr, "Out of moemory.\n");
+ fprintf (stderr, "Out of memory.\n");
+ return 1;
+ }
+ if (*query_str == '\0') {
+ fprintf (stderr, "Error: notmuch search requires at least one search term.\n");
return 1;
}
notmuch_query_set_sort (query, sort);
- if (max_threads < 0 || max_threads > NOTMUCH_SHOW_INITIAL_BURST)
- {
- do_search_threads (ctx, query, sort,
- first, NOTMUCH_SHOW_INITIAL_BURST);
+ /* If we receive a max-threads option, then the user is
+ responsible for any chunking and we return all results at
+ once. */
+ if (max_threads < 0)
+ chunk_size = NOTMUCH_SEARCH_INITIAL_CHUNK_SIZE;
+ else
+ chunk_size = max_threads;
+
+ do {
+ threads_in_chunk = do_search_threads (ctx, query, sort,
+ first, chunk_size);
+ if (chunk_size == max_threads)
+ break;
- first += NOTMUCH_SHOW_INITIAL_BURST;
- if (max_threads > 0)
- max_threads -= NOTMUCH_SHOW_INITIAL_BURST;
- }
+ first += chunk_size;
+
+ chunk_size *= 2;
- do_search_threads (ctx, query, sort, first, max_threads);
+ } while (threads_in_chunk);
notmuch_query_destroy (query);
notmuch_database_close (notmuch);