[PATCH] completion: complete addresses in from:/to: search terms

diff --git a/9b/b13977f91ade1abb2649c8e49c3b4a4f53fbd0 b/9b/b13977f91ade1abb2649c8e49c3b4a4f53fbd0
new file mode 100644 (file)
index 0000000..dc9edeb
--- /dev/null
+++ b/9b/b13977f91ade1abb2649c8e49c3b4a4f53fbd0
@@ -0,0 +1,134 @@
+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 06892431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 04:44:31 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.738\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.738 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_LOW=-0.7]\r
+       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 OzwW4heQ4gAM for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Mar 2015 04:44:26 -0800 (PST)\r
+Received: from mail-we0-f176.google.com (mail-we0-f176.google.com\r
+       [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0BDCA431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Mar 2015 04:44:26 -0800 (PST)\r
+Received: by wesx3 with SMTP id x3so17973591wes.4\r
+       for <notmuch@notmuchmail.org>; Sat, 07 Mar 2015 04:44:24 -0800 (PST)\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;\r
+       bh=YiCgrK88aWn9FyKle7pTCeKzMQI38fShBtBTLKga/iY=;\r
+       b=LLwF+TdR0S3fUmkz+58y0GIQOhbwSvpazlswbQFoe1o0GAmiwjmuePZvPhxTxaE+vy\r
+       udTTSxk3O30m48Put/92w5epMAlYgiJIk5jsmydu8eSSjKmc/QMFQLohzc13ak1GMCkr\r
+       zmfz1YJl87jN44jRwROsRje2UY8QWPgtYQv2KTva/weUZGYv0PuHAlLZe+iytTgQlvPZ\r
+       1JWgebmyzIVAYm/nsuenIZ0kZ8yLKb37Vwa7sih4y8yyDuzLCm6y/+xLrvY7rd4MF8r1\r
+       a0rqQcDU1bc3bzDbE4kC/5tH10qnf7ssAzpykRttz75mI5cGdCEvX3v7g7Hgo86mA1ww\r
+       xnVg==\r
+X-Gm-Message-State:\r
+ ALoCoQnYoc3zR4iS3zRKQixQK4xGXX7/YRrmQ3KZ02qjCK3GKyxc6af08D7nhMyvmhutLgvTXcbT\r
+X-Received: by 10.180.20.177 with SMTP id o17mr83436757wie.66.1425732263909;\r
+       Sat, 07 Mar 2015 04:44:23 -0800 (PST)\r
+Received: from localhost (mobile-internet-bcee3b-76.dhcp.inet.fi.\r
+       [188.238.59.76]) by mx.google.com with ESMTPSA id\r
+       pp10sm17701351wjc.31.2015.03.07.04.44.22\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Sat, 07 Mar 2015 04:44:22 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] completion: complete addresses in from:/to: search terms\r
+Date: Sat,  7 Mar 2015 14:44:42 +0200\r
+Message-Id: <1425732282-1113-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\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, 07 Mar 2015 12:44:31 -0000\r
+\r
+Use the new notmuch address command to do completion for addresses in\r
+from: and to:. Use --output=sender for both for efficiency, even\r
+though --output=recipients would be more accurate for to: prefix\r
+completion.\r
+\r
+---\r
+\r
+This is v2 of id:1422388098-16333-5-git-send-email-jani@nikula.org\r
+opting for --output=sender for both to: and from:. Added a comment to\r
+point this out.\r
+---\r
+ completion/notmuch-completion.bash | 33 ++++++++++++++++++++++++++++-----\r
+ 1 file changed, 28 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+index e0498903f22f..960275d1f672 100644\r
+--- a/completion/notmuch-completion.bash\r
++++ b/completion/notmuch-completion.bash\r
+@@ -27,10 +27,33 @@\r
+ # on completion.\r
+ #\r
+ \r
+-_notmuch_user_emails()\r
++# $1: current input of the form prefix:partialinput, where prefix is\r
++# to or from.\r
++_notmuch_email()\r
+ {\r
+-    notmuch config get user.primary_email\r
+-    notmuch config get user.other_email\r
++    local output prefix cur\r
++\r
++    prefix="${1%%:*}"\r
++    cur="${1#*:}"\r
++\r
++    # Cut the input to be completed at punctuation because\r
++    # (apparently) Xapian does not support the trailing wildcard '*'\r
++    # operator for input with punctuation. We let compgen handle the\r
++    # extra filtering required.\r
++    cur="${cur%%[^a-zA-Z0-9]*}"\r
++\r
++    case "$prefix" in\r
++      # Note: It would be more accurate and less surprising to have\r
++      # output=recipients here for to: addresses, but as gathering\r
++      # the recipient addresses requires disk access for each\r
++      # matching message, this becomes prohibitively slow.\r
++      to|from) output=sender;;\r
++      *) return;;\r
++    esac\r
++\r
++    # Only emit plain, lower case, unique addresses.\r
++    notmuch address --output=$output $prefix:"${cur}*" | \\r
++      sed 's/[^<]*<\([^>]*\)>/\1/' | tr "[:upper:]" "[:lower:]" | sort -u\r
+ }\r
+ \r
+ _notmuch_search_terms()\r
+@@ -44,10 +67,10 @@ _notmuch_search_terms()\r
+           COMPREPLY=( $(compgen -P "tag:" -W "`notmuch search --output=tags \*`" -- ${cur##tag:}) )\r
+           ;;\r
+       to:*)\r
+-          COMPREPLY=( $(compgen -P "to:" -W "`_notmuch_user_emails`" -- ${cur##to:}) )\r
++          COMPREPLY=( $(compgen -P "to:" -W "`_notmuch_email ${cur}`" -- ${cur##to:}) )\r
+           ;;\r
+       from:*)\r
+-          COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_user_emails`" -- ${cur##from:}) )\r
++          COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_email ${cur}`" -- ${cur##from:}) )\r
+           ;;\r
+       path:*)\r
+           local path=`notmuch config get database.path`\r
+-- \r
+2.1.4\r
+\r