vim: preserve the 'show everything' flag when finding next/prev buffer

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 59ffb038b1a56ca9550c2a466c0bab7a746066ae..dc44eb66bf4a249949dd25f004c7b98b85ff8912 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -20,16 +20,10 @@
 
 #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
 do_search_threads (const void *ctx,
                   notmuch_query_t *query,
-                  notmuch_sort_t sort,
-                  int first, int max_threads)
+                  notmuch_sort_t sort)
 {
     notmuch_thread_t *thread;
     notmuch_threads_t *threads;
@@ -37,7 +31,7 @@ do_search_threads (const void *ctx,
     time_t date;
     const char *relative_date;
 
-    for (threads = notmuch_query_search_threads (query, first, max_threads);
+    for (threads = notmuch_query_search_threads (query);
         notmuch_threads_has_more (threads);
         notmuch_threads_advance (threads))
     {
@@ -45,7 +39,7 @@ do_search_threads (const void *ctx,
 
        thread = notmuch_threads_get (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);
@@ -83,31 +77,25 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
     char *query_str;
-    int i, first = 0, max_threads = -1;
-    char *opt, *end;
-    notmuch_sort_t sort = NOTMUCH_SORT_DATE;
+    char *opt;
+    notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
+    int i;
 
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
            i++;
            break;
        }
-       if (STRNCMP_LITERAL (argv[i], "--first=") == 0) {
-           opt = argv[i] + sizeof ("--first=") - 1;
-           first = strtoul (opt, &end, 10);
-           if (*opt == '\0' || *end != '\0') {
-               fprintf (stderr, "Invalid value for --first: %s\n", opt);
-               return 1;
-           }
-       } else if (STRNCMP_LITERAL (argv[i], "--max-threads=") == 0) {
-           opt = argv[i] + sizeof ("--max-threads=") - 1;
-           max_threads = strtoul (opt, &end, 10);
-           if (*opt == '\0' || *end != '\0') {
-               fprintf (stderr, "Invalid value for --max-threads: %s\n", opt);
+        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 (strcmp (argv[i], "--reverse") == 0) {
-           sort = NOTMUCH_SORT_DATE_REVERSE;
        } else {
            fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
            return 1;
@@ -121,13 +109,18 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     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;
     }
 
@@ -139,17 +132,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
 
     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);
-
-       first += NOTMUCH_SHOW_INITIAL_BURST;
-       if (max_threads > 0)
-           max_threads -= NOTMUCH_SHOW_INITIAL_BURST;
-    }
-
-    do_search_threads (ctx, query, sort, first, max_threads);
+    do_search_threads (ctx, query, sort);
 
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);