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 59ffb038b1a56ca9550c2a466c0bab7a746066ae..aa6662bd73b62b3708e363f196abc9abf39b0f0e 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -45,7 +45,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);
@@ -85,7 +85,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     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;
 
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
@@ -106,8 +106,16 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
                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;
@@ -121,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;
     }