[PATCH v6 4/6] cli: add support for --output parameter in notmuch count
Jani Nikula
jani at nikula.org
Sun Nov 13 13:15:33 PST 2011
Add support for --output=messages (which remains the default) and
--output=threads to notmuch count.
Signed-off-by: Jani Nikula <jani at nikula.org>
---
NEWS | 5 +++++
notmuch-count.c | 18 ++++++++++++++++--
notmuch.1 | 29 +++++++++++++++++++++++++----
notmuch.c | 20 ++++++++++++++++----
4 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/NEWS b/NEWS
index abc749a..78434d9 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,11 @@ Add "notmuch search" --first and --maxitems options
The search command now takes options --first=[-]N and --maxitems=N to limit
the number of results shown.
+Add "notmuch count --output" option
+
+ The count command is now capable of counting threads in addition to
+ messages. This is selected using the new --output=(threads|messages) option.
+
Notmuch 0.9 (2011-10-01)
========================
diff --git a/notmuch-count.c b/notmuch-count.c
index a35be40..20ce334 100644
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -29,6 +29,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
notmuch_query_t *query;
char *query_str;
int i;
+ notmuch_bool_t output_messages = TRUE;
argc--; argv++; /* skip subcommand argument */
@@ -37,7 +38,17 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
i++;
break;
}
- {
+ if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {
+ const char *opt = argv[i] + sizeof ("--output=") - 1;
+ if (strcmp (opt, "threads") == 0) {
+ output_messages = FALSE;
+ } else if (strcmp (opt, "messages") == 0) {
+ output_messages = TRUE;
+ } else {
+ fprintf (stderr, "Invalid value for --output: %s\n", opt);
+ return 1;
+ }
+ } else {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1;
}
@@ -71,7 +82,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
return 1;
}
- printf ("%u\n", notmuch_query_count_messages(query));
+ if (output_messages)
+ printf ("%u\n", notmuch_query_count_messages (query));
+ else
+ printf ("%u\n", notmuch_query_count_threads (query));
notmuch_query_destroy (query);
notmuch_database_close (notmuch);
diff --git a/notmuch.1 b/notmuch.1
index 15c3147..64114db 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -372,14 +372,35 @@ section below for details of the supported syntax for <search-terms>.
.RE
.RS 4
.TP 4
-.BR count " <search-term>..."
+.BR count " [options...] <search-term>..."
Count messages matching the search terms.
-The number of matching messages is output to stdout.
+The number of matching messages (or threads) is output to stdout.
-With no search terms, a count of all messages in the database will be
-displayed.
+With no search terms, a count of all messages (or threads) in the database will
+be displayed.
+
+Supported options for
+.B count
+include
+.RS 4
+.TP 4
+.B \-\-output=(messages|threads)
+
+.RS 4
+.TP 4
+.B messages
+
+Output the number of matching messages. This is the default.
+.RE
+.RS 4
+.TP 4
+.B threads
+
+Output the number of matching threads.
+.RE
+.RE
.RE
.RE
diff --git a/notmuch.c b/notmuch.c
index 601ffad..0a4ffe9 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -328,12 +328,24 @@ static command_t commands[] = {
"\tSee \"notmuch help search-terms\" for details of the search\n"
"\tterms syntax." },
{ "count", notmuch_count_command,
- "<search-terms> [...]",
+ "[options...] <search-terms> [...]",
"Count messages matching the search terms.",
- "\tThe number of matching messages is output to stdout.\n"
+ "\tThe number of matching messages (or threads) is output to stdout.\n"
+ "\n"
+ "\tWith no search terms, a count of all messages (or threads) in\n"
+ "\tthe database will be displayed.\n"
+ "\n"
+ "\tSupported options for count include:\n"
+ "\n"
+ "\t--output=(messages|threads)\n"
+ "\n"
+ "\t\tmessages (default)\n"
+ "\n"
+ "\t\tOutput the number of matching messages.\n"
+ "\n"
+ "\t\tthreads\n"
"\n"
- "\tWith no search terms, a count of all messages in the database\n"
- "\twill be displayed.\n"
+ "\t\tOutput the number of matching threads.\n"
"\n"
"\tSee \"notmuch help search-terms\" for details of the search\n"
"\tterms syntax." },
--
1.7.5.4
More information about the notmuch
mailing list