cli: move config open/close to main() from subcommands

[notmuch] / notmuch-count.c

diff --git a/notmuch-count.c b/notmuch-count.c
index 63459fb611f98d9a69507df7afdb919e61272563..390794ff9ae45c1719e7aadcf72933ce054106e7 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -26,17 +26,21 @@ enum {
     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[])
+notmuch_count_command (notmuch_config_t *config, int argc, char *argv[])
 {
-    notmuch_config_t *config;
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
     char *query_str;
     int opt_index;
     int output = OUTPUT_MESSAGES;
-    const char **search_exclude_tags;
-    size_t search_exclude_tags_length;
+    int exclude = EXCLUDE_TRUE;
     unsigned int i;
 
     notmuch_opt_desc_t options[] = {
@@ -44,6 +48,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
          (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 }
     };
 
@@ -53,23 +61,18 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
+    if (notmuch_database_open (notmuch_config_get_database_path (config),
+                              NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
        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-opt_index, argv+opt_index);
+    query_str = query_string_from_args (config, argc-opt_index, argv+opt_index);
     if (query_str == NULL) {
        fprintf (stderr, "Out of memory.\n");
        return 1;
     }
 
     if (*query_str == '\0') {
-       query_str = talloc_strdup (ctx, "");
+       query_str = talloc_strdup (config, "");
     }
 
     query = notmuch_query_create (notmuch, query_str);
@@ -78,10 +81,15 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    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]);
+    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:
@@ -93,7 +101,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
     }
 
     notmuch_query_destroy (query);
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return 0;
 }