X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-count.c;h=50b0c193f04625c794b9ab9287ab6bdd9c4f29da;hp=8772cff80aa2b3f8079181c8ca7a06fede37488b;hb=85c830405886207196aedbd0a2b757b227ba769d;hpb=c6265706e8c0981c48536567c2d69d64aef2e55d diff --git a/notmuch-count.c b/notmuch-count.c index 8772cff8..50b0c193 100644 --- a/notmuch-count.c +++ b/notmuch-count.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Keith Packard */ @@ -24,6 +24,7 @@ enum { OUTPUT_THREADS, OUTPUT_MESSAGES, + OUTPUT_FILES, }; /* The following is to allow future options to be added more easily */ @@ -32,49 +33,118 @@ enum { EXCLUDE_FALSE, }; +/* Return the number of files matching the query, or -1 for an error */ +static int +count_files (notmuch_query_t *query) +{ + notmuch_messages_t *messages; + notmuch_message_t *message; + notmuch_filenames_t *filenames; + notmuch_status_t status; + int count = 0; + + status = notmuch_query_search_messages (query, &messages); + if (print_status_query ("notmuch count", query, status)) + return -1; + + 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; +} + +/* return 0 on success, -1 on failure */ static int print_count (notmuch_database_t *notmuch, const char *query_str, - const char **exclude_tags, size_t exclude_tags_length, int output) + const char **exclude_tags, size_t exclude_tags_length, int output, int print_lastmod) { notmuch_query_t *query; size_t i; + int count; + unsigned int ucount; + unsigned long revision; + const char *uuid; + int ret = 0; + notmuch_status_t status; query = notmuch_query_create (notmuch, query_str); if (query == NULL) { fprintf (stderr, "Out of memory\n"); - return 1; + return -1; } - for (i = 0; i < exclude_tags_length; i++) - notmuch_query_add_tag_exclude (query, exclude_tags[i]); + for (i = 0; i < exclude_tags_length; i++) { + status = notmuch_query_add_tag_exclude (query, exclude_tags[i]); + if (status && status != NOTMUCH_STATUS_IGNORED) { + print_status_query ("notmuch count", query, status); + return -1; + } + } switch (output) { case OUTPUT_MESSAGES: - printf ("%u\n", notmuch_query_count_messages (query)); + status = notmuch_query_count_messages (query, &ucount); + if (print_status_query ("notmuch count", query, status)) + return -1; + printf ("%u", ucount); break; case OUTPUT_THREADS: - printf ("%u\n", notmuch_query_count_threads (query)); + status = notmuch_query_count_threads (query, &ucount); + if (print_status_query ("notmuch count", query, status)) + return -1; + printf ("%u", ucount); + break; + case OUTPUT_FILES: + count = count_files (query); + if (count >= 0) { + printf ("%d", count); + } else { + ret = -1; + goto DONE; + } break; } + if (print_lastmod) { + revision = notmuch_database_get_revision (notmuch, &uuid); + printf ("\t%s\t%lu\n", uuid, revision); + } else { + fputs ("\n", stdout); + } + + DONE: notmuch_query_destroy (query); - return 0; + return ret; } static int count_file (notmuch_database_t *notmuch, FILE *input, const char **exclude_tags, - size_t exclude_tags_length, int output) + size_t exclude_tags_length, int output, int print_lastmod) { char *line = NULL; ssize_t line_len; size_t line_size; int ret = 0; - while (!ret && (line_len = getline (&line, &line_size, input)) != -1) { + while (! ret && (line_len = getline (&line, &line_size, input)) != -1) { chomp_newline (line); ret = print_count (notmuch, line, exclude_tags, exclude_tags_length, - output); + output, print_lastmod); } if (line) @@ -94,6 +164,7 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) const char **search_exclude_tags = NULL; size_t search_exclude_tags_length = 0; notmuch_bool_t batch = FALSE; + notmuch_bool_t print_lastmod = FALSE; FILE *input = stdin; char *input_file_name = NULL; int ret; @@ -102,21 +173,24 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) { 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, &print_lastmod, "lastmod", 'l', 0 }, { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 }, { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, + { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, { 0, 0, 0, 0, 0 } }; opt_index = parse_arguments (argc, argv, options, 1); + if (opt_index < 0) + return EXIT_FAILURE; - if (opt_index < 0) { - return 1; - } + notmuch_process_shared_options (argv[0]); if (input_file_name) { batch = TRUE; @@ -124,23 +198,25 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) if (input == NULL) { fprintf (stderr, "Error opening %s for reading: %s\n", input_file_name, strerror (errno)); - return 1; + return EXIT_FAILURE; } } if (batch && opt_index != argc) { fprintf (stderr, "--batch and query string are not compatible\n"); - return 1; + return EXIT_FAILURE; } if (notmuch_database_open (notmuch_config_get_database_path (config), NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) - return 1; + return EXIT_FAILURE; - query_str = query_string_from_args (config, argc-opt_index, argv+opt_index); + notmuch_exit_if_unmatched_db_uuid (notmuch); + + 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; + return EXIT_FAILURE; } if (exclude == EXCLUDE_TRUE) { @@ -150,15 +226,15 @@ notmuch_count_command (notmuch_config_t *config, int argc, char *argv[]) if (batch) ret = count_file (notmuch, input, search_exclude_tags, - search_exclude_tags_length, output); + search_exclude_tags_length, output, print_lastmod); else ret = print_count (notmuch, query_str, search_exclude_tags, - search_exclude_tags_length, output); + search_exclude_tags_length, output, print_lastmod); notmuch_database_destroy (notmuch); if (input != stdin) fclose (input); - return ret; + return ret ? EXIT_FAILURE : EXIT_SUCCESS; }