From 2fbcea1a16f1ba90d37b5a8a876ce3a484a52e08 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 1 Dec 2012 13:36:46 +0000 Subject: [PATCH] [PATCH] contrib: pick: use notmuch-clean-address --- 55/f783baf87529c0b264d67f81245a447cee4109 | 161 ++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 55/f783baf87529c0b264d67f81245a447cee4109 diff --git a/55/f783baf87529c0b264d67f81245a447cee4109 b/55/f783baf87529c0b264d67f81245a447cee4109 new file mode 100644 index 000000000..cd2bee6dc --- /dev/null +++ b/55/f783baf87529c0b264d67f81245a447cee4109 @@ -0,0 +1,161 @@ +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 A30C5431FBC + for ; Sat, 1 Dec 2012 05:37:01 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + 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 hNFpmczpmLYU for ; + Sat, 1 Dec 2012 05:36:57 -0800 (PST) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 76C75431FAF + for ; Sat, 1 Dec 2012 05:36:57 -0800 (PST) +Received: by mail-we0-f181.google.com with SMTP id t11so574798wey.26 + for ; Sat, 01 Dec 2012 05:36:56 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=NeVOK7Gxn+TVJdqHGZu9cNOTsKbO72fbIbwv18UJAqI=; + b=WycOk7Kv5mxCSEDkhWKetTfj+87qUd8yKNTGp+LDUk3g8v3ZloWqKEbXBLAy4PMlZS + AnfSGAMVOSp9r/sv2RMW9ROgD6JDL2MsGn0CPx3yYE1OFU+1VBqQzmvSKjqs3W06bBEW + iE7tywQltiI5F8OVJ3dRFQEqhxOGtsjQB31HMG9Zmui/LWdsitJYXN4v/kbaWTFPnk9j + ZCcLsL8zA2UMlBmJpxOpqjoCG6V4S1jBB3fp+3OVJLylbpZRK9+E0uptLHw1l6iAcZAt + g+6F6+cuPTruxWZvmAOrX27nbx3Z2Ix0MLmKnCxLNiY00METaCyO+SKcdBKzb6tT2KG7 + X6Dg== +Received: by 10.180.107.197 with SMTP id he5mr2194037wib.1.1354369015064; + Sat, 01 Dec 2012 05:36:55 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPS id d9sm3085732wiw.0.2012.12.01.05.36.53 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 01 Dec 2012 05:36:54 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH] contrib: pick: use notmuch-clean-address +Date: Sat, 1 Dec 2012 13:36:46 +0000 +Message-Id: <1354369006-1793-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +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, 01 Dec 2012 13:37:01 -0000 + +Now notmuch-clean-address is split out in show pick can use that (with a small +wrapper). + +--- +This removes another 50 lines or so of duplicated code from notmuch-pick. + +Best wishes + +Mark + + contrib/notmuch-pick/notmuch-pick.el | 65 +++++---------------------------- + 1 files changed, 10 insertions(+), 55 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index 5f9e456..6871d7b 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -35,7 +35,6 @@ + (declare-function notmuch-show "notmuch-show" (&rest args)) + (declare-function notmuch-tag "notmuch" (query &rest tags)) + (declare-function notmuch-show-strip-re "notmuch-show" (subject)) +-(declare-function notmuch-show-clean-address "notmuch-show" (parsed-address)) + (declare-function notmuch-show-spaces-n "notmuch-show" (n)) + (declare-function notmuch-read-query "notmuch" (prompt)) + (declare-function notmuch-read-tag-changes "notmuch" (&optional initial-input &rest search-terms)) +@@ -521,62 +520,18 @@ than only the current message." + (message (format "Command '%s' exited abnormally with code %d" + shell-command exit-code))))))) + +-;; Shamelessly stolen from notmuch-show.el: should be unified. + (defun notmuch-pick-clean-address (address) +- "Try to clean a single email ADDRESS for display. Return ++ "Try to clean a single email ADDRESS for display. Return ++AUTHOR_NAME if present, otherwise return AUTHOR_EMAIL. Return + unchanged ADDRESS if parsing fails." +- (condition-case nil +- (let (p-name p-address) +- ;; It would be convenient to use `mail-header-parse-address', +- ;; but that expects un-decoded mailbox parts, whereas our +- ;; mailbox parts are already decoded (and hence may contain +- ;; UTF-8). Given that notmuch should handle most of the awkward +- ;; cases, some simple string deconstruction should be sufficient +- ;; here. +- (cond +- ;; "User " style. +- ((string-match "\\(.*\\) <\\(.*\\)>" address) +- (setq p-name (match-string 1 address) +- p-address (match-string 2 address))) +- +- ;; "" style. +- ((string-match "<\\(.*\\)>" address) +- (setq p-address (match-string 1 address))) +- +- ;; Everything else. +- (t +- (setq p-address address))) +- +- (when p-name +- ;; Remove elements of the mailbox part that are not relevant for +- ;; display, even if they are required during transport: +- ;; +- ;; Backslashes. +- (setq p-name (replace-regexp-in-string "\\\\" "" p-name)) +- +- ;; Outer single and double quotes, which might be nested. +- (loop +- with start-of-loop +- do (setq start-of-loop p-name) +- +- when (string-match "^\"\\(.*\\)\"$" p-name) +- do (setq p-name (match-string 1 p-name)) +- +- when (string-match "^'\\(.*\\)'$" p-name) +- do (setq p-name (match-string 1 p-name)) +- +- until (string= start-of-loop p-name))) +- +- ;; If the address is 'foo@bar.com ' then show just +- ;; 'foo@bar.com'. +- (when (string= p-name p-address) +- (setq p-name nil)) +- +- ;; If we have a name return that otherwise return the address. +- (if (not p-name) +- p-address +- p-name)) +- (error address))) ++ (let* ((clean-address (notmuch-clean-address address)) ++ (p-address (car clean-address)) ++ (p-name (cdr clean-address))) ++ ++ ;; If we have a name return that otherwise return the address. ++ (if (not p-name) ++ p-address ++ p-name))) + + (defun notmuch-pick-insert-field (field format-string msg) + (let* ((headers (plist-get msg :headers)) +-- +1.7.9.1 + -- 2.26.2