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