perf-test: split basic into 00-new, 01-dump-restore, and 02-tag

[notmuch] / notmuch-count.c

diff --git a/notmuch-count.c b/notmuch-count.c
index 39f08c6ca94476757c5591c7a171c74c16875018..2f9812821ebeb7cf2f18542541beaf9a8e37e4be 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -21,6 +21,17 @@
 
 #include "notmuch-client.h"
 
+enum {
+    OUTPUT_THREADS,
+    OUTPUT_MESSAGES,
+};
+
+/* The following is to allow future options to be added more easily */
+enum {
+    EXCLUDE_TRUE,
+    EXCLUDE_FALSE,
+};
+
 int
 notmuch_count_command (void *ctx, int argc, char *argv[])
 {
@@ -28,64 +39,38 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
     char *query_str;
-    int i;
-#if 0
-    char *opt, *end;
-    int i, first = 0, max_threads = -1;
-    notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
-#endif
-
-    for (i = 0; i < argc && argv[i][0] == '-'; i++) {
-       if (strcmp (argv[i], "--") == 0) {
-           i++;
-           break;
-       }
-#if 0
-       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);
-               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
-#endif
-       {
-           fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
-           return 1;
-       }
-    }
+    int opt_index;
+    int output = OUTPUT_MESSAGES;
+    int exclude = EXCLUDE_TRUE;
+    unsigned int i;
 
-    argc -= i;
-    argv += i;
+    notmuch_opt_desc_t options[] = {
+       { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
+         (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
+                                 { "messages", OUTPUT_MESSAGES },
+                                 { 0, 0 } } },
+       { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
+         (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
+                                 { "false", EXCLUDE_FALSE },
+                                 { 0, 0 } } },
+       { 0, 0, 0, 0, 0 }
+    };
+
+    opt_index = parse_arguments (argc, argv, options, 1);
+
+    if (opt_index < 0) {
+       return 1;
+    }
 
     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)
+    if (notmuch_database_open (notmuch_config_get_database_path (config),
+                              NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
        return 1;
 
-    query_str = query_string_from_args (ctx, argc, argv);
+    query_str = query_string_from_args (ctx, argc-opt_index, argv+opt_index);
     if (query_str == NULL) {
        fprintf (stderr, "Out of memory.\n");
        return 1;
@@ -101,10 +86,27 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    printf ("%u\n", notmuch_query_count_messages(query));
+    if (exclude == EXCLUDE_TRUE) {
+       const char **search_exclude_tags;
+       size_t search_exclude_tags_length;
+
+       search_exclude_tags = notmuch_config_get_search_exclude_tags
+           (config, &search_exclude_tags_length);
+       for (i = 0; i < search_exclude_tags_length; i++)
+           notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
+    }
+
+    switch (output) {
+    case OUTPUT_MESSAGES:
+       printf ("%u\n", notmuch_query_count_messages (query));
+       break;
+    case OUTPUT_THREADS:
+       printf ("%u\n", notmuch_query_count_threads (query));
+       break;
+    }
 
     notmuch_query_destroy (query);
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return 0;
 }