cli: add --output=files option to notmuch count

[notmuch] / notmuch-count.c

diff --git a/notmuch-count.c b/notmuch-count.c
index b76690c0d5eb776096c481f2aff6d9fd62a3e728..01e4e3012b8a07c799418c1c256107bb4e1cffa4 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -24,6 +24,7 @@
 enum {
     OUTPUT_THREADS,
     OUTPUT_MESSAGES,
+    OUTPUT_FILES,
 };
 
 /* The following is to allow future options to be added more easily */
@@ -32,27 +33,119 @@ enum {
     EXCLUDE_FALSE,
 };
 
+static unsigned int
+count_files (notmuch_query_t *query)
+{
+    notmuch_messages_t *messages;
+    notmuch_message_t *message;
+    notmuch_filenames_t *filenames;
+    unsigned int count = 0;
+
+    messages = notmuch_query_search_messages (query);
+    if (messages == NULL)
+       return 0;
+
+    for (;
+        notmuch_messages_valid (messages);
+        notmuch_messages_move_to_next (messages)) {
+       message = notmuch_messages_get (messages);
+       filenames = notmuch_message_get_filenames (message);
+
+       for (;
+            notmuch_filenames_valid (filenames);
+            notmuch_filenames_move_to_next (filenames))
+           count++;
+
+       notmuch_filenames_destroy (filenames);
+       notmuch_message_destroy (message);
+    }
+
+    notmuch_messages_destroy (messages);
+
+    return count;
+}
+
+static int
+print_count (notmuch_database_t *notmuch, const char *query_str,
+            const char **exclude_tags, size_t exclude_tags_length, int output)
+{
+    notmuch_query_t *query;
+    size_t i;
+
+    query = notmuch_query_create (notmuch, query_str);
+    if (query == NULL) {
+       fprintf (stderr, "Out of memory\n");
+       return 1;
+    }
+
+    for (i = 0; i < exclude_tags_length; i++)
+       notmuch_query_add_tag_exclude (query, 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;
+    case OUTPUT_FILES:
+       printf ("%u\n", count_files (query));
+       break;
+    }
+
+    notmuch_query_destroy (query);
+
+    return 0;
+}
+
+static int
+count_file (notmuch_database_t *notmuch, FILE *input, const char **exclude_tags,
+           size_t exclude_tags_length, int output)
+{
+    char *line = NULL;
+    ssize_t line_len;
+    size_t line_size;
+    int ret = 0;
+
+    while (!ret && (line_len = getline (&line, &line_size, input)) != -1) {
+       chomp_newline (line);
+       ret = print_count (notmuch, line, exclude_tags, exclude_tags_length,
+                          output);
+    }
+
+    if (line)
+       free (line);
+
+    return ret;
+}
+
 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;
     int exclude = EXCLUDE_TRUE;
-    unsigned int i;
+    const char **search_exclude_tags = NULL;
+    size_t search_exclude_tags_length = 0;
+    notmuch_bool_t batch = FALSE;
+    FILE *input = stdin;
+    char *input_file_name = NULL;
+    int ret;
 
     notmuch_opt_desc_t options[] = {
        { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
          (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
                                  { "messages", OUTPUT_MESSAGES },
+                                 { "files", OUTPUT_FILES },
                                  { 0, 0 } } },
        { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
          (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
                                  { "false", EXCLUDE_FALSE },
                                  { 0, 0 } } },
+       { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
+       { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
        { 0, 0, 0, 0, 0 }
     };
 
@@ -62,52 +155,47 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
+    if (input_file_name) {
+       batch = TRUE;
+       input = fopen (input_file_name, "r");
+       if (input == NULL) {
+           fprintf (stderr, "Error opening %s for reading: %s\n",
+                    input_file_name, strerror (errno));
+           return 1;
+       }
+    }
+
+    if (batch && opt_index != argc) {
+       fprintf (stderr, "--batch and query string are not compatible\n");
        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-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 = notmuch_query_create (notmuch, query_str);
-    if (query == NULL) {
-       fprintf (stderr, "Out of memory\n");
-       return 1;
-    }
-
     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;
-    }
+    if (batch)
+       ret = count_file (notmuch, input, search_exclude_tags,
+                         search_exclude_tags_length, output);
+    else
+       ret = print_count (notmuch, query_str, search_exclude_tags,
+                          search_exclude_tags_length, output);
 
-    notmuch_query_destroy (query);
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
-    return 0;
+    if (input != stdin)
+       fclose (input);
+
+    return ret;
 }