notmuch.el: Use variable notmuch-search-oldest-first to decide the search order

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 3873a067cb59d5c21173ecdb23778848c6707a2b..dc44eb66bf4a249949dd25f004c7b98b85ff8912 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -20,53 +20,38 @@
 
 #include "notmuch-client.h"
 
-int
-notmuch_search_command (void *ctx, int argc, char *argv[])
+static void
+do_search_threads (const void *ctx,
+                  notmuch_query_t *query,
+                  notmuch_sort_t sort)
 {
-    notmuch_config_t *config;
-    notmuch_database_t *notmuch;
-    notmuch_query_t *query;
-    notmuch_threads_t *threads;
     notmuch_thread_t *thread;
+    notmuch_threads_t *threads;
     notmuch_tags_t *tags;
-    char *query_str;
-    const char *relative_date;
     time_t date;
-
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
-       return 1;
-
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
-    if (notmuch == NULL)
-       return 1;
-
-    query_str = query_string_from_args (ctx, argc, argv);
-    if (query_str == NULL) {
-       fprintf (stderr, "Out of moemory.\n");
-       return 1;
-    }
-
-    query = notmuch_query_create (notmuch, query_str);
-    if (query == NULL) {
-       fprintf (stderr, "Out of memory\n");
-       return 1;
-    }
+    const char *relative_date;
 
     for (threads = notmuch_query_search_threads (query);
         notmuch_threads_has_more (threads);
         notmuch_threads_advance (threads))
     {
-       int first = 1;
+       int first_tag = 1;
 
        thread = notmuch_threads_get (threads);
 
-       date = notmuch_thread_get_oldest_date (thread);
+       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 %s",
+       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 (" (");
@@ -74,15 +59,80 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
             notmuch_tags_has_more (tags);
             notmuch_tags_advance (tags))
        {
-           if (! first)
+           if (! first_tag)
                printf (" ");
            printf ("%s", notmuch_tags_get (tags));
-           first = 0;
+           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;
+    char *query_str;
+    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], "--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;
+       }
+    }
+
+    argc -= i;
+    argv += i;
+
+    config = notmuch_config_open (ctx, NULL, NULL);
+    if (config == NULL)
+       return 1;
+
+    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 memory.\n");
+       return 1;
+    }
+    if (*query_str == '\0') {
+       fprintf (stderr, "Error: notmuch search requires at least one search term.\n");
+       return 1;
+    }
+
+    query = notmuch_query_create (notmuch, query_str);
+    if (query == NULL) {
+       fprintf (stderr, "Out of memory\n");
+       return 1;
+    }
+
+    notmuch_query_set_sort (query, sort);
+
+    do_search_threads (ctx, query, sort);
 
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);