Date: Mon, 30 Jan 2012 10:04:53 -0500
From: Austin Clements <amdragon@MIT.EDU>
To: David Edmondson <dme@dme.org>
Subject: Re: [PATCH] emacs: More address cleaning.
Message-ID: <20120130150453.GQ17991@mit.edu>
References: <1327935594-14180-1-git-send-email-dme@dme.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1327935594-14180-1-git-send-email-dme@dme.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: notmuch@notmuchmail.org
Precedence: list

loop freaks me out a little, but LGTM.

Quoth David Edmondson on Jan 30 at  2:59 pm:
> Remove outer single-quotes from the mailbox part. Allow for multiple
> sets of nested single and double quotes.
> 
> Add more tests.
> ---
>  emacs/notmuch-show.el          |   24 +++++++++++++++++-------
>  test/emacs-address-cleaning.el |    8 ++++++++
>  2 files changed, 25 insertions(+), 7 deletions(-)
> 
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index 84ac624..7bfbda9 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -315,15 +315,25 @@ unchanged ADDRESS if parsing fails."
>         (t
>  	(setq p-address address)))
>  
> -      ;; Remove elements of the mailbox part that are not relevant for
> -      ;; display, even if they are required during transport.
>        (when p-name
> -	;; Outer double quotes.
> -	(when (string-match "^\"\\(.*\\)\"$" p-name)
> -	  (setq p-name (match-string 1 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)))
> +	(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 <foo@bar.com>' then show just
>        ;; 'foo@bar.com'.
> diff --git a/test/emacs-address-cleaning.el b/test/emacs-address-cleaning.el
> index 3b0b109..8423245 100644
> --- a/test/emacs-address-cleaning.el
> +++ b/test/emacs-address-cleaning.el
> @@ -21,11 +21,19 @@
>  		  "foo (at home) <foo@bar.com>"
>  		  "foo [at home] <foo@bar.com>"
>  		  "Foo Bar"
> +		  "'Foo Bar' <foo@bar.com>"
> +		  "\"'Foo Bar'\" <foo@bar.com>"
> +		  "'\"Foo Bar\"' <foo@bar.com>"
> +		  "'\"'Foo Bar'\"' <foo@bar.com>"
>  		  "Fred Dibna \\[extraordinaire\\] <fred@dibna.com>"))
>  	 (expected '("ДБ <db-uknot@stop.me.uk>"
>  		     "foo (at home) <foo@bar.com>"
>  		     "foo [at home] <foo@bar.com>"
>  		     "Foo Bar"
> +		     "Foo Bar <foo@bar.com>"
> +		     "Foo Bar <foo@bar.com>"
> +		     "Foo Bar <foo@bar.com>"
> +		     "Foo Bar <foo@bar.com>"
>  		     "Fred Dibna [extraordinaire] <fred@dibna.com>"))
>  	 (output (mapcar #'notmuch-show-clean-address input)))
>      (notmuch-test-expect-equal output expected)))