From 3cba1f0b78dff03cf57da584c4a62324da44aed8 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 6 Apr 2014 06:44:49 +0100 Subject: [PATCH] [PATCH v2 5/5] emacs: Add a sort-order option to saved-searches --- 74/b776b5881b0744497f748290e37eccc513f407 | 138 ++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 74/b776b5881b0744497f748290e37eccc513f407 diff --git a/74/b776b5881b0744497f748290e37eccc513f407 b/74/b776b5881b0744497f748290e37eccc513f407 new file mode 100644 index 000000000..b2af61543 --- /dev/null +++ b/74/b776b5881b0744497f748290e37eccc513f407 @@ -0,0 +1,138 @@ +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 4FE9A431FC2 + for ; Sat, 5 Apr 2014 22:45:35 -0700 (PDT) +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 sDtzSEzRbAc4 for ; + Sat, 5 Apr 2014 22:45:28 -0700 (PDT) +Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com + [209.85.212.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 8386E431FCB + for ; Sat, 5 Apr 2014 22:45:12 -0700 (PDT) +Received: by mail-wi0-f176.google.com with SMTP id r20so3354395wiv.3 + for ; Sat, 05 Apr 2014 22:45:11 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=cvOGaj5FMk+DCB/r36KSs/XY/pjMLi35LiNhnr0ok6w=; + b=ibFDmxNIzxLiO0ZjP2Y33DkNFjYzTqyZc8weO4I19hTO0rn3AZ6rWBO+9WHbFgAUHv + yRBr3KK9RhBEI7ryN4e9ehza2Ea0VFEHnvm9WHhLF9IsktL7xAyiV518A4sKePMsInbK + OR45RdxD1cFKS83LGn/KOom2WMraiqKDxNyV5C3IBg9YKi4IdFPHM6v81sYxXXeNpQV2 + NIg3KboEh4I0LTwTZdvXuV44Af39EXyYo1nYiRCnfxAvMahycTWr8XuhR7nElmFBf3C6 + ANCU0XhOfaQT0jT7Z/dcjm72ZlasMfBvd5XB3swv44iMSaIFoZJvLo0eXrDl+xeDNu3L + hv+w== +X-Received: by 10.180.219.44 with SMTP id pl12mr16574095wic.12.1396763111466; + Sat, 05 Apr 2014 22:45:11 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id v6sm15204280wif.0.2014.04.05.22.45.10 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 05 Apr 2014 22:45:11 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@MIT.EDU +Subject: [PATCH v2 5/5] emacs: Add a sort-order option to saved-searches +Date: Sun, 6 Apr 2014 06:44:49 +0100 +Message-Id: <1396763089-32452-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com> +References: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com> +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: Sun, 06 Apr 2014 05:45:35 -0000 + +This adds a sort-order option to saved-searches, stores it in the +saved-search buttons (widgets), and uses the stored value when the +button is pressed. + +Storing the sort-order in the widget was suggested by Jani in +id:4c3876274126985683e888641b29cf18142a5eb8.1391771337.git.jani@nikula.org. +--- + emacs/notmuch-hello.el | 8 +++++++- + emacs/notmuch-lib.el | 10 +++++++++- + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +index f440352..f0675f2 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -363,7 +363,8 @@ (defun notmuch-hello-reflect (list ncols) + (defun notmuch-hello-widget-search (widget &rest ignore) + (notmuch-search (widget-get widget + :notmuch-search-terms) +- notmuch-search-oldest-first)) ++ (widget-get widget ++ :notmuch-search-oldest-first))) + + (defun notmuch-saved-search-count (search) + (car (process-lines notmuch-command "count" search))) +@@ -495,12 +496,17 @@ (defun notmuch-hello-insert-buttons (searches) + (widget-insert (make-string column-indent ? ))) + (let* ((name (plist-get elem :name)) + (query (plist-get elem :query)) ++ (oldest-first (case (plist-get elem :sort-order) ++ (newest-first nil) ++ (oldest-first t) ++ (otherwise notmuch-search-oldest-first))) + (msg-count (plist-get elem :count))) + (widget-insert (format "%8s " + (notmuch-hello-nice-number msg-count))) + (widget-create 'push-button + :notify #'notmuch-hello-widget-search + :notmuch-search-terms query ++ :notmuch-search-oldest-first oldest-first + name) + (setq column-indent + (1+ (max 0 (- column-width (length name))))))) +diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +index a54a055..3a3c69d 100644 +--- a/emacs/notmuch-lib.el ++++ b/emacs/notmuch-lib.el +@@ -125,7 +125,12 @@ (define-widget 'notmuch-saved-search-plist 'list + (group :format "%v" :inline t (const :format " Query: " :query) (string :format "%v"))) + (checklist :inline t + :format "%v" +- (group :format "%v" :inline t (const :format "Count-Query: " :count-query) (string :format "%v"))))) ++ (group :format "%v" :inline t (const :format "Count-Query: " :count-query) (string :format "%v")) ++ (group :format "%v" :inline t (const :format "" :sort-order) ++ (choice :tag " Sort Order" ++ (const :tag "Default" nil) ++ (const :tag "Oldest-first" oldest-first) ++ (const :tag "Newest-first" newest-first)))))) + + (defcustom notmuch-saved-searches '((:name "inbox" :query "tag:inbox") + (:name "unread" :query "tag:unread")) +@@ -139,6 +144,9 @@ (defcustom notmuch-saved-searches '((:name "inbox" :query "tag:inbox") + :count-query Optional extra query to generate the count + shown. If not present then the :query property + is used. ++ :sort-order Specify the sort order to be used for the search. ++ Possible values are 'oldest-first 'newest-first or ++ nil. Nil means use the default sort order. + + Other accepted forms are a cons cell of the form (NAME . QUERY) + or a list of the form (NAME QUERY COUNT-QUERY)." +-- +1.7.10.4 + -- 2.26.2