Rename NOTMUCH_DATABASE_MODE_WRITABLE to NOTMUCH_DATABASE_MODE_READ_WRITE

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 85f3514ee099b4142097dde4cd1e0895c979c3af..aa6662bd73b62b3708e363f196abc9abf39b0f0e 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -20,20 +20,72 @@
 
 #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_thread_t *thread;
+    notmuch_threads_t *threads;
+    notmuch_tags_t *tags;
+    time_t date;
+    const char *relative_date;
+
+    for (threads = notmuch_query_search_threads (query, first, max_threads);
+        notmuch_threads_has_more (threads);
+        notmuch_threads_advance (threads))
+    {
+       int first_tag = 1;
+
+       thread = notmuch_threads_get (threads);
+
+       if (sort == NOTMUCH_SORT_OLDEST_FIRST)
+           date = notmuch_thread_get_oldest_date (thread);
+       else
+           date = notmuch_thread_get_newest_date (thread);
+
+       relative_date = notmuch_time_relative_date (ctx, date);
+
+       printf ("thread:%s %12s [%d/%d] %s; %s",
+               notmuch_thread_get_thread_id (thread),
+               relative_date,
+               notmuch_thread_get_matched_messages (thread),
+               notmuch_thread_get_total_messages (thread),
+               notmuch_thread_get_authors (thread),
+               notmuch_thread_get_subject (thread));
+
+       printf (" (");
+       for (tags = notmuch_thread_get_tags (thread);
+            notmuch_tags_has_more (tags);
+            notmuch_tags_advance (tags))
+       {
+           if (! first_tag)
+               printf (" ");
+           printf ("%s", notmuch_tags_get (tags));
+           first_tag = 0;
+       }
+       printf (")\n");
+
+       notmuch_thread_destroy (thread);
+    }
+}
+
 int
 notmuch_search_command (void *ctx, int argc, char *argv[])
 {
     notmuch_config_t *config;
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
-    notmuch_threads_t *threads;
-    notmuch_thread_t *thread;
-    notmuch_tags_t *tags;
     char *query_str;
-    const char *relative_date;
-    time_t date;
     int i, first = 0, max_threads = -1;
     char *opt, *end;
+    notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
 
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
@@ -54,6 +106,19 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
                fprintf (stderr, "Invalid value for --max-threads: %s\n", opt);
                return 1;
            }
+       } 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;
        }
     }
 
@@ -64,13 +129,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;
     }
 
@@ -80,38 +150,20 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    for (threads = notmuch_query_search_threads (query, first, max_threads);
-        notmuch_threads_has_more (threads);
-        notmuch_threads_advance (threads))
-    {
-       int first = 1;
-
-       thread = notmuch_threads_get (threads);
-
-       date = notmuch_thread_get_oldest_date (thread);
-       relative_date = notmuch_time_relative_date (ctx, date);
+    notmuch_query_set_sort (query, sort);
 
-       printf ("thread:%s %12s %s; %s",
-               notmuch_thread_get_thread_id (thread),
-               relative_date,
-               notmuch_thread_get_authors (thread),
-               notmuch_thread_get_subject (thread));
-
-       printf (" (");
-       for (tags = notmuch_thread_get_tags (thread);
-            notmuch_tags_has_more (tags);
-            notmuch_tags_advance (tags))
-       {
-           if (! first)
-               printf (" ");
-           printf ("%s", notmuch_tags_get (tags));
-           first = 0;
-       }
-       printf (")\n");
+    if (max_threads < 0 || max_threads > NOTMUCH_SHOW_INITIAL_BURST)
+    {
+       do_search_threads (ctx, query, sort,
+                          first, NOTMUCH_SHOW_INITIAL_BURST);
 
-       notmuch_thread_destroy (thread);
+       first += NOTMUCH_SHOW_INITIAL_BURST;
+       if (max_threads > 0)
+           max_threads -= NOTMUCH_SHOW_INITIAL_BURST;
     }
 
+    do_search_threads (ctx, query, sort, first, max_threads);
+
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);