From: Austin Clements Date: Mon, 30 Jan 2012 04:48:06 +0000 (+1900) Subject: Re: [PATCH v2 03/13] emacs: make "+" and "-" tagging operations in notmuch-search... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=47183a80679ac15ceeacf51d267765e1d9bcdac8;p=notmuch-archives.git Re: [PATCH v2 03/13] emacs: make "+" and "-" tagging operations in notmuch-search more robust --- diff --git a/24/2bd0c9dadfbfffcc9ccbee5a20f20434e09e7a b/24/2bd0c9dadfbfffcc9ccbee5a20f20434e09e7a new file mode 100644 index 000000000..aec63b927 --- /dev/null +++ b/24/2bd0c9dadfbfffcc9ccbee5a20f20434e09e7a @@ -0,0 +1,328 @@ +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 73E18429E34 + for ; Sun, 29 Jan 2012 20:49:09 -0800 (PST) +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 EmA5AgOtOpBj for ; + Sun, 29 Jan 2012 20:49:02 -0800 (PST) +Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU + [18.7.68.34]) + by olra.theworths.org (Postfix) with ESMTP id 02587431FBC + for ; Sun, 29 Jan 2012 20:49:01 -0800 (PST) +X-AuditID: 12074422-b7fd66d0000008f9-5c-4f2621396f83 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP + id 59.98.02297.931262F4; Sun, 29 Jan 2012 23:48:57 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q0U4munF017066; + Sun, 29 Jan 2012 23:48:57 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0U4mt7L028524 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 29 Jan 2012 23:48:56 -0500 (EST) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1Rrj9y-0000VZ-PP; Sun, 29 Jan 2012 23:48:06 -0500 +Date: Sun, 29 Jan 2012 23:48:06 -0500 +From: Austin Clements +To: Dmitry Kurochkin +Subject: Re: [PATCH v2 03/13] emacs: make "+" and "-" tagging operations in + notmuch-search more robust +Message-ID: <20120130044806.GM17991@mit.edu> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327890382-548-1-git-send-email-dmitry.kurochkin@gmail.com> + <1327890382-548-4-git-send-email-dmitry.kurochkin@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <1327890382-548-4-git-send-email-dmitry.kurochkin@gmail.com> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrEKsWRmVeSWpSXmKPExsUixG6nrmujqOZvsGK1tMXVrf3sFtdvzmR2 + YPLYOesuu8ezVbeYA5iiuGxSUnMyy1KL9O0SuDL+XXnPUnA1pKJ/91XGBsYZLl2MnBwSAiYS + F19eY4SwxSQu3FvP1sXIxSEksI9RomvZG0YIZwOjxI4pB1ggnJNMEpv/rWGHcJYwSnRO+8kM + 0s8ioCpxee55dhCbTUBDYtv+5WBzRQQMJW5dfAVWwywgLfHtdzMTiC0skCHR2LYNyObg4BXQ + kXh0EWrbcUaJYysfgNXzCghKnJz5hAWiV0vixr+XYPUgc5b/4wAJcwp4Suy4spYVxBYVUJGY + cnIb2wRGoVlIumch6Z6F0L2AkXkVo2xKbpVubmJmTnFqsm5xcmJeXmqRrqlebmaJXmpK6SZG + cGC7KO1g/HlQ6RCjAAejEg9v0D9VfyHWxLLiytxDjJIcTEqivEkKav5CfEn5KZUZicUZ8UWl + OanFhxglOJiVRHgf/QQq501JrKxKLcqHSUlzsCiJ86prvfMTEkhPLEnNTk0tSC2CyWpwcAhc + OXhkNqMUS15+XqqSBG8RyALBotT01Iq0zJwShFImDk6QRTxAi0pAaniLCxJzizPTIfKnGI05 + 2t/uPs/I8Xb+/vOMQmDjpMR5Y0FKBUBKM0rz4KbBktYrRnGgR4V5z4NU8QATHty8V0CrmIBW + PWcA+am4JBEhJdXAuFzzitYWIa4fMYeORfYpcy0+u+63GcvGJ5ciSs7+1hDZpZ+o/+23l8+p + AvW2vcpH505VTm+zqf/5Sd+sTjAxJlNjxf6P8aEWytOTKyJ63J00zmZ96Uri+aN35cNtu/ef + NI/5+62/ZWb99fLFKLPUWwrXqrvunT1avpCpQ22D3Hb3q0tFN3THKrEUZyQaajEXFScCALwa + BO01AwAA +Cc: notmuch@notmuchmail.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: Mon, 30 Jan 2012 04:49:09 -0000 + +Looking good. Just a few small points below. + +Quoth Dmitry Kurochkin on Jan 30 at 6:26 am: +> Before the change, "+" and "-" tagging operations in notmuch-search +> view accepted only a single tag. The patch makes them use the +> recently added `notmuch-read-tag-changes' function (renamed +> `notmuch-select-tags-with-completion'), which allows to enter multiple +> tags with "+" and "-" prefixes. So after the change, "+" and "-" +> bindings in notmuch-search view allow to both add and remove multiple +> tags. The only difference between "+" and "-" is the minibuffer +> initial input ("+" and "-" respectively). +> --- +> emacs/notmuch.el | 164 +++++++++++++++++++++++++++--------------------------- +> 1 files changed, 82 insertions(+), 82 deletions(-) +> +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index ff46617..90b594c 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -76,38 +76,57 @@ For example: +> (defvar notmuch-query-history nil +> "Variable to store minibuffer history for notmuch queries") +> +> -(defun notmuch-tag-completions (&optional prefixes search-terms) +> - (let ((tag-list +> - (split-string +> - (with-output-to-string +> - (with-current-buffer standard-output +> - (apply 'call-process notmuch-command nil t +> - nil "search-tags" search-terms))) +> - "\n+" t))) +> - (if (null prefixes) +> - tag-list +> - (apply #'append +> - (mapcar (lambda (tag) +> - (mapcar (lambda (prefix) +> - (concat prefix tag)) prefixes)) +> - tag-list))))) +> +(defun notmuch-tag-completions (&optional search-terms) +> + (split-string +> + (with-output-to-string +> + (with-current-buffer standard-output +> + (apply 'call-process notmuch-command nil t +> + nil "search-tags" search-terms))) +> + "\n+" t)) +> +> (defun notmuch-select-tag-with-completion (prompt &rest search-terms) +> - (let ((tag-list (notmuch-tag-completions nil search-terms))) +> + (let ((tag-list (notmuch-tag-completions search-terms))) +> (completing-read prompt tag-list))) +> +> -(defun notmuch-select-tags-with-completion (prompt &optional prefixes &rest search-terms) +> - (let ((tag-list (notmuch-tag-completions prefixes search-terms)) +> - (crm-separator " ") +> - ;; By default, space is bound to "complete word" function. +> - ;; Re-bind it to insert a space instead. Note that +> - ;; still does the completion. +> - (crm-local-completion-map +> - (let ((map (make-sparse-keymap))) +> - (set-keymap-parent map crm-local-completion-map) +> - (define-key map " " 'self-insert-command) +> - map))) +> - (delete "" (completing-read-multiple prompt tag-list)))) +> +(defun notmuch-read-tag-changes (&optional initial-input &rest search-terms) +> + (let* ((all-tag-list (notmuch-tag-completions)) +> + (add-tag-list (mapcar (apply-partially 'concat "+") all-tag-list)) +> + (remove-tag-list (mapcar (apply-partially 'concat "-") +> + (if (null search-terms) +> + all-tag-list +> + (notmuch-tag-completions search-terms)))) +> + (tag-list (append add-tag-list remove-tag-list)) +> + (crm-separator " ") +> + ;; By default, space is bound to "complete word" function. +> + ;; Re-bind it to insert a space instead. Note that +> + ;; still does the completion. +> + (crm-local-completion-map +> + (let ((map (make-sparse-keymap))) +> + (set-keymap-parent map crm-local-completion-map) +> + (define-key map " " 'self-insert-command) +> + map))) +> + (delete "" (completing-read-multiple "Tags (+add -drop): " +> + tag-list nil nil initial-input)))) +> + +> +(defun notmuch-update-tags (tags tag-changes) +> + "Return a copy of TAGS with additions and removals from TAG-CHANGES. +> + +> +TAG-CHANGES must be a list of tags names, each prefixed with +> +either a \"+\" to indicate the tag should be added to TAGS if not +> +present or a \"-\" to indicate that the tag should be removed +> +from TAGS if present." +> + (let ((result-tags (copy-sequence tags))) +> + (dolist (tag-change tag-changes) +> + (unless (string= tag-change "") + +This function should give the "must be of the form" error for empty +strings, rather than silently ignoring them. It turns out +`string-to-char' on an empty string is fine (it returns 0, which will +trigger the error), but `substring' isn't. Perhaps move the unless +into the let before, like + (let ((op (string-to-char tag-change)) + (tag (unless (string= tag-change "") (substring tag-change 1)))) + +> + (let ((op (string-to-char tag-change)) +> + (tag (substring tag-change 1))) +> + (case op +> + (?+ (unless (member tag result-tags) +> + (push tag result-tags))) +> + (?- (setq result-tags (delete tag result-tags))) +> + (otherwise +> + (error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))) +> + (sort result-tags 'string<))) +> +> (defun notmuch-foreach-mime-part (function mm-handle) +> (cond ((stringp (car mm-handle)) +> @@ -447,6 +466,10 @@ Complete list of currently available key bindings: +> "Return a list of threads for the current region" +> (notmuch-search-properties-in-region 'notmuch-search-thread-id beg end)) +> +> +(defun notmuch-search-find-thread-id-region-search (beg end) +> + "Return a search string for threads for the current region" +> + (mapconcat 'identity (notmuch-search-find-thread-id-region beg end) " or ")) +> + +> (defun notmuch-search-find-authors () +> "Return the authors for the current thread" +> (get-text-property (point) 'notmuch-search-authors)) +> @@ -590,74 +613,53 @@ the messages that were tagged" +> (forward-line 1)) +> output))) +> +> -(defun notmuch-search-add-tag-thread (tag) +> - (notmuch-search-add-tag-region tag (point) (point))) +> +(defun notmuch-search-tag-thread (&rest tags) + +Maybe "tag-changes" instead of "tags" for this and +notmuch-search-tag-region? + +> + "Change tags for the currently selected thread. +> +> -(defun notmuch-search-add-tag-region (tag beg end) +> - (let ((search-id-string (mapconcat 'identity (notmuch-search-find-thread-id-region beg end) " or "))) +> - (notmuch-tag search-id-string (concat "+" tag)) +> - (save-excursion +> - (let ((last-line (line-number-at-pos end)) +> - (max-line (- (line-number-at-pos (point-max)) 2))) +> - (goto-char beg) +> - (while (<= (line-number-at-pos) (min last-line max-line)) +> - (notmuch-search-set-tags (delete-dups (sort (cons tag (notmuch-search-get-tags)) 'string<))) +> - (forward-line)))))) +> +See `notmuch-search-tag-region' for details." +> + (apply 'notmuch-search-tag-region (point) (point) tags)) +> +> -(defun notmuch-search-remove-tag-thread (tag) +> - (notmuch-search-remove-tag-region tag (point) (point))) +> +(defun notmuch-search-tag-region (beg end &rest tags) +> + "Change tags for threads in the given region. +> +> -(defun notmuch-search-remove-tag-region (tag beg end) +> - (let ((search-id-string (mapconcat 'identity (notmuch-search-find-thread-id-region beg end) " or "))) +> - (notmuch-tag search-id-string (concat "-" tag)) +> +TAGS is a list of tag operations for `notmuch-tag'. The tags are +> +added or removed for all threads in the region from BEG to END." +> + (let ((search-string (notmuch-search-find-thread-id-region-search beg end))) +> + (apply 'notmuch-tag search-string tags) +> (save-excursion +> (let ((last-line (line-number-at-pos end)) +> (max-line (- (line-number-at-pos (point-max)) 2))) +> (goto-char beg) +> (while (<= (line-number-at-pos) (min last-line max-line)) +> - (notmuch-search-set-tags (delete tag (notmuch-search-get-tags))) +> + (notmuch-search-set-tags +> + (notmuch-update-tags (notmuch-search-get-tags) tags)) +> (forward-line)))))) +> +> -(defun notmuch-search-add-tag (tag) +> - "Add a tag to the currently selected thread or region. +> - +> -The tag is added to all messages in the currently selected thread +> -or threads in the current region." +> - (interactive +> - (list (notmuch-select-tag-with-completion "Tag to add: "))) +> - (save-excursion +> - (if (region-active-p) +> - (let* ((beg (region-beginning)) +> - (end (region-end))) +> - (notmuch-search-add-tag-region tag beg end)) +> - (notmuch-search-add-tag-thread tag)))) +> - +> -(defun notmuch-search-remove-tag (tag) +> - "Remove a tag from the currently selected thread or region. + +It's great to see all of this old copy-pasted code go away! + +> +(defun notmuch-search-tag (&optional initial-input) +> + "Change tags for the currently selected thread or region." +> + (interactive) +> + (let* ((beg (if (region-active-p) (region-beginning) (point))) +> + (end (if (region-active-p) (region-end) (point))) +> + (search-string (notmuch-search-find-thread-id-region-search beg end)) +> + (tags (notmuch-read-tag-changes initial-input search-string))) +> + (apply 'notmuch-search-tag-region beg end tags))) +> + +> +(defun notmuch-search-add-tag () +> + "Same as `notmuch-search-tag' but sets initial input to '+'." +> + (interactive) +> + (notmuch-search-tag "+")) +> +> -The tag is removed from all messages in the currently selected +> -thread or threads in the current region." +> - (interactive +> - (list (notmuch-select-tag-with-completion +> - "Tag to remove: " +> - (if (region-active-p) +> - (mapconcat 'identity +> - (notmuch-search-find-thread-id-region (region-beginning) (region-end)) +> - " ") +> - (notmuch-search-find-thread-id))))) +> - (save-excursion +> - (if (region-active-p) +> - (let* ((beg (region-beginning)) +> - (end (region-end))) +> - (notmuch-search-remove-tag-region tag beg end)) +> - (notmuch-search-remove-tag-thread tag)))) +> +(defun notmuch-search-remove-tag () +> + "Same as `notmuch-search-tag' but sets initial input to '-'." +> + (interactive) +> + (notmuch-search-tag "-")) +> +> (defun notmuch-search-archive-thread () +> "Archive the currently selected thread (remove its \"inbox\" tag). +> +> This function advances the next thread when finished." +> (interactive) +> - (notmuch-search-remove-tag-thread "inbox") +> + (notmuch-search-tag-thread "-inbox") +> (notmuch-search-next-thread)) +> +> (defvar notmuch-search-process-filter-data nil +> @@ -893,9 +895,7 @@ will prompt for tags to be added or removed. Tags prefixed with +> Each character of the tag name may consist of alphanumeric +> characters as well as `_.+-'. +> " +> - (interactive (notmuch-select-tags-with-completion +> - "Operations (+add -drop): notmuch tag " +> - '("+" "-"))) +> + (interactive (notmuch-read-tag-changes)) +> (apply 'notmuch-tag notmuch-search-query-string actions)) +> +> (defun notmuch-search-buffer-title (query)