From ddab379d4ffd945d2465dee33a4890e4d3a1ba6f Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 6 Sep 2014 15:53:29 +0300 Subject: [PATCH] [PATCH 2/3] cli: add --output=address-{from, to, all} to notmuch search --- 78/259ba4841bffc7dfb3a989afd652e59825e0a5 | 260 ++++++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 78/259ba4841bffc7dfb3a989afd652e59825e0a5 diff --git a/78/259ba4841bffc7dfb3a989afd652e59825e0a5 b/78/259ba4841bffc7dfb3a989afd652e59825e0a5 new file mode 100644 index 000000000..98f05bedb --- /dev/null +++ b/78/259ba4841bffc7dfb3a989afd652e59825e0a5 @@ -0,0 +1,260 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id A7420431FBF + for ; Sat, 6 Sep 2014 05:53:42 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id e4BXsuna3MXl for ; + Sat, 6 Sep 2014 05:53:37 -0700 (PDT) +Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com + [209.85.212.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C752F431FB6 + for ; Sat, 6 Sep 2014 05:53:36 -0700 (PDT) +Received: by mail-wi0-f177.google.com with SMTP id cc10so611667wib.10 + for ; Sat, 06 Sep 2014 05:53:35 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=67ussr107JnP+nsdIIVXY8dsX268nP+T5B+rrbgGJwo=; + b=kEmIrhRsIMVTspMvaRxuusBoJg2pfpES/S2ZCjDWsC1Wvt4qUFRSkb2rDBu5doWivg + S7o0jBN1ZIWu6rvp90VKWU64jiirv8NUkJCTGZC81VomGJ4NfnPkQyGLv8UwFCc4QKhP + WP7AvLkq4Ascr/3Q0UAOqPJzJRNTLsnjqQVW1/l9D6Q92GrrwYDn5VH1mX2QfTf34uFs + 46OWf254Gvmqpd4yji9m/6y5kOraA9hGwxJ7zRqsPfxpv7mnGbDcINxQnjk6VZn+u57B + wuMGSOB5yxsBxeTj8/K2njNkWX21P5KzK5SPV8PuEnZZv6fh4H8OmUskJaVWpr0fFa+T + qMqw== +X-Gm-Message-State: + ALoCoQlIxYHUVX8zUa0DLxHRB7nXIJUbDD1+46a9C2iB8D/syFfKcGo1YRDe7bbZUSi8YikqQWHL +X-Received: by 10.194.94.196 with SMTP id de4mr22023025wjb.86.1410008014396; + Sat, 06 Sep 2014 05:53:34 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw2-58c374-75.dhcp.inet.fi. + [88.195.116.75]) + by mx.google.com with ESMTPSA id n5sm4467625wja.38.2014.09.06.05.53.33 + for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 06 Sep 2014 05:53:33 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] cli: add --output=address-{from, to, + all} to notmuch search +Date: Sat, 6 Sep 2014 15:53:29 +0300 +Message-Id: <1410008010-3770-2-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 2.1.0 +In-Reply-To: <1410008010-3770-1-git-send-email-jani@nikula.org> +References: <1410008010-3770-1-git-send-email-jani@nikula.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 06 Sep 2014 12:53:43 -0000 + +address-from prints reply-to or from, address-to prints to, cc, and +bcc, and address-all prints all of them. +--- + notmuch-search.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 104 insertions(+), 9 deletions(-) + +diff --git a/notmuch-search.c b/notmuch-search.c +index bc9be4593ecc..c84ecc31262c 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -23,11 +23,14 @@ + #include "string-util.h" + + typedef enum { +- OUTPUT_SUMMARY, +- OUTPUT_THREADS, +- OUTPUT_MESSAGES, +- OUTPUT_FILES, +- OUTPUT_TAGS ++ OUTPUT_SUMMARY = 1 << 0, ++ OUTPUT_THREADS = 1 << 1, ++ OUTPUT_MESSAGES = 1 << 2, ++ OUTPUT_FILES = 1 << 3, ++ OUTPUT_TAGS = 1 << 4, ++ OUTPUT_ADDRESS_FROM = 1 << 5, ++ OUTPUT_ADDRESS_TO = 1 << 6, ++ OUTPUT_ADDRESS_ALL = OUTPUT_ADDRESS_FROM | OUTPUT_ADDRESS_TO, + } output_t; + + /* Return two stable query strings that identify exactly the matched +@@ -214,6 +217,66 @@ do_search_threads (sprinter_t *format, + return 0; + } + ++static void ++print_address_list (sprinter_t *format, InternetAddressList *list) ++{ ++ InternetAddress *address; ++ int i; ++ ++ for (i = 0; i < internet_address_list_length (list); i++) { ++ address = internet_address_list_get_address (list, i); ++ if (INTERNET_ADDRESS_IS_GROUP (address)) { ++ InternetAddressGroup *group; ++ InternetAddressList *group_list; ++ ++ group = INTERNET_ADDRESS_GROUP (address); ++ group_list = internet_address_group_get_members (group); ++ if (group_list == NULL) ++ continue; ++ ++ print_address_list (format, group_list); ++ } else { ++ InternetAddressMailbox *mailbox; ++ const char *name; ++ const char *addr; ++ char *full_address; ++ ++ mailbox = INTERNET_ADDRESS_MAILBOX (address); ++ ++ name = internet_address_get_name (address); ++ addr = internet_address_mailbox_get_addr (mailbox); ++ ++ if (name && *name) ++ full_address = talloc_asprintf (NULL, "%s <%s>", name, addr); ++ else ++ full_address = talloc_asprintf (NULL, "<%s>", addr); ++ ++ if (!full_address) ++ break; ++ ++ format->string (format, full_address); ++ format->separator (format); ++ ++ talloc_free (full_address); ++ } ++ } ++} ++ ++static void ++print_address_string (sprinter_t *format, const char *recipients) ++{ ++ InternetAddressList *list; ++ ++ if (recipients == NULL) ++ return; ++ ++ list = internet_address_list_parse_string (recipients); ++ if (list == NULL) ++ return; ++ ++ print_address_list (format, list); ++} ++ + static int + do_search_messages (sprinter_t *format, + notmuch_query_t *query, +@@ -264,11 +327,33 @@ do_search_messages (sprinter_t *format, + + notmuch_filenames_destroy( filenames ); + +- } else { /* output == OUTPUT_MESSAGES */ ++ } else if (output == OUTPUT_MESSAGES) { + format->set_prefix (format, "id"); + format->string (format, + notmuch_message_get_message_id (message)); + format->separator (format); ++ } else { ++ if (output & OUTPUT_ADDRESS_FROM) { ++ const char *addrs; ++ ++ addrs = notmuch_message_get_header (message, "reply-to"); ++ ++ if (addrs == NULL || *addrs == '\0') ++ addrs = notmuch_message_get_header (message, "from"); ++ ++ print_address_string (format, addrs); ++ } ++ ++ if (output & OUTPUT_ADDRESS_TO) { ++ const char *hdrs[] = { "to", "cc", "bcc" }; ++ const char *addrs; ++ size_t j; ++ ++ for (j = 0; j < ARRAY_SIZE (hdrs); j++) { ++ addrs = notmuch_message_get_header (message, hdrs[j]); ++ print_address_string (format, addrs); ++ } ++ } + } + + notmuch_message_destroy (message); +@@ -338,7 +423,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST; + sprinter_t *format = NULL; + int opt_index, ret; +- output_t output = OUTPUT_SUMMARY; ++ output_t output = 0; + int offset = 0; + int limit = -1; /* unlimited */ + notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE; +@@ -364,10 +449,12 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { "text0", NOTMUCH_FORMAT_TEXT0 }, + { 0, 0 } } }, + { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 }, +- { NOTMUCH_OPT_KEYWORD, &output, "output", 'o', ++ { NOTMUCH_OPT_KEYWORD_FLAGS, &output, "output", 'o', + (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, + { "threads", OUTPUT_THREADS }, + { "messages", OUTPUT_MESSAGES }, ++ { "address-from", OUTPUT_ADDRESS_FROM }, ++ { "address-to", OUTPUT_ADDRESS_TO }, + { "files", OUTPUT_FILES }, + { "tags", OUTPUT_TAGS }, + { 0, 0 } } }, +@@ -387,6 +474,9 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + if (opt_index < 0) + return EXIT_FAILURE; + ++ if (! output) ++ output = OUTPUT_SUMMARY; ++ + switch (format_sel) { + case NOTMUCH_FORMAT_TEXT: + format = sprinter_text_create (config, stdout); +@@ -453,18 +543,23 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + } + + switch (output) { +- default: + case OUTPUT_SUMMARY: + case OUTPUT_THREADS: + ret = do_search_threads (format, query, sort, output, offset, limit); + break; + case OUTPUT_MESSAGES: ++ case OUTPUT_ADDRESS_FROM: ++ case OUTPUT_ADDRESS_TO: ++ case OUTPUT_ADDRESS_ALL: + case OUTPUT_FILES: + ret = do_search_messages (format, query, output, offset, limit, dupe); + break; + case OUTPUT_TAGS: + ret = do_search_tags (notmuch, format, query); + break; ++ default: ++ fprintf (stderr, "Error: the combination of outputs is not supported.\n"); ++ ret = 1; + } + + notmuch_query_destroy (query); +-- +2.1.0 + -- 2.26.2