cli: search: Add --output=count

[notmuch.git] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 47aa97902e69e4aec23773a020a742cab948f858..41f41073cc5657ea2da1a042567d0b4d1a2e551b 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -30,9 +30,10 @@ typedef enum {
     OUTPUT_TAGS                = 1 << 4,
     OUTPUT_SENDER      = 1 << 5,
     OUTPUT_RECIPIENTS  = 1 << 6,
+    OUTPUT_COUNT       = 1 << 7,
 } output_t;
 
-#define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS)
+#define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS | OUTPUT_COUNT)
 
 typedef enum {
     FILTER_BY_NAMEADDR = 0,
@@ -56,6 +57,7 @@ typedef struct {
 typedef struct {
     const char *name;
     const char *addr;
+    int count;
 } mailbox_t;
 
 /* Return two stable query strings that identify exactly the matched
@@ -244,6 +246,7 @@ check_duplicite (const search_options_t *opt, GHashTable *addrs, const char *nam
 {
     notmuch_bool_t duplicite;
     char *key;
+    mailbox_t *mailbox;
 
     if (opt->filter_by == FILTER_BY_ADDRFOLD ||
        opt->filter_by == FILTER_BY_NAMEADDRFOLD) {
@@ -274,12 +277,18 @@ check_duplicite (const search_options_t *opt, GHashTable *addrs, const char *nam
     if (! key)
        return FALSE;
 
-    duplicite = g_hash_table_lookup_extended (addrs, key, NULL, NULL);
+    duplicite = g_hash_table_lookup_extended (addrs, key, NULL, (gpointer)&mailbox);
 
-    if (! duplicite)
-       g_hash_table_insert (addrs, key, NULL);
-    else
+    if (! duplicite) {
+       mailbox = talloc (opt->format, mailbox_t);
+       mailbox->name = talloc_strdup (mailbox, name);
+       mailbox->addr = talloc_strdup (mailbox, addr);
+       mailbox->count = 1;
+       g_hash_table_insert (addrs, key, mailbox);
+    } else {
+       mailbox->count++;
        talloc_free (key);
+    }
 
     return duplicite;
 }
@@ -289,6 +298,7 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)
 {
     const char *name = mailbox->name;
     const char *addr = mailbox->addr;
+    int count = mailbox->count;
 
     if (opt->format->is_text_printer) {
        char *mailbox_str;
@@ -302,6 +312,10 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)
            fprintf (stderr, "Error: out of memory\n");
            return;
        }
+       if (count > 0) {
+           opt->format->integer (opt->format, count);
+           opt->format->string (opt->format, "\t");
+       }
        opt->format->string (opt->format, mailbox_str);
        opt->format->separator (opt->format);
 
@@ -312,6 +326,10 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)
        opt->format->string (opt->format, name);
        opt->format->map_key (opt->format, "address");
        opt->format->string (opt->format, addr);
+       if (count > 0) {
+           opt->format->map_key (opt->format, "count");
+           opt->format->integer (opt->format, count);
+       }
        opt->format->end (opt->format);
        opt->format->separator (opt->format);
     }
@@ -341,11 +359,15 @@ process_address_list (const search_options_t *opt, GHashTable *addrs,
            mailbox_t mbx = {
                .name = internet_address_get_name (address),
                .addr = internet_address_mailbox_get_addr (mailbox),
+               .count = 0,
            };
 
            if (check_duplicite (opt, addrs, mbx.name, mbx.addr))
                continue;
 
+           if (opt->output & OUTPUT_COUNT)
+               continue;
+
            print_mailbox (opt, &mbx);
        }
     }
@@ -372,6 +394,15 @@ _my_talloc_free_for_g_hash (void *ptr)
     talloc_free (ptr);
 }
 
+static void
+print_hash_value (unused (gpointer key), gpointer value, gpointer user_data)
+{
+    const mailbox_t *mailbox = value;
+    search_options_t *opt = user_data;
+
+    print_mailbox (opt, mailbox);
+}
+
 static int
 do_search_messages (search_options_t *opt)
 {
@@ -384,7 +415,7 @@ do_search_messages (search_options_t *opt)
 
     if (opt->output & OUTPUT_ADDRESS_FLAGS)
        addresses = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                          _my_talloc_free_for_g_hash, NULL);
+                                          _my_talloc_free_for_g_hash, _my_talloc_free_for_g_hash);
 
     if (opt->offset < 0) {
        opt->offset += notmuch_query_count_messages (opt->query);
@@ -451,6 +482,9 @@ do_search_messages (search_options_t *opt)
        notmuch_message_destroy (message);
     }
 
+    if (addresses && opt->output & OUTPUT_COUNT)
+       g_hash_table_foreach (addresses, print_hash_value, opt);
+
     if (addresses)
        g_hash_table_unref (addresses);
 
@@ -554,6 +588,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
                                  { "recipients", OUTPUT_RECIPIENTS },
                                  { "files", OUTPUT_FILES },
                                  { "tags", OUTPUT_TAGS },
+                                 { "count", OUTPUT_COUNT },
                                  { 0, 0 } } },
         { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
           (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },