From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/9] cli/show: detangle overloading of params.part for single message display
Date: Fri, 6 Jan 2017 22:14:42 +0200 [thread overview]
Message-ID: <b4443b6d35acb69e56eb675700257c54ac89b740.1483733461.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1483733461.git.jani@nikula.org>
In-Reply-To: <cover.1483733461.git.jani@nikula.org>
The use of params.part has become rather convoluted in notmuch
show. Add another variable for selecting single message display to
make the code easier to read. No functional changes.
---
notmuch-show.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index 22fa655ad20d..2f0d142a26e2 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1013,6 +1013,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
int exclude = EXCLUDE_TRUE;
int entire_thread = ENTIRE_THREAD_DEFAULT;
+ notmuch_bool_t single_message;
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',
@@ -1051,6 +1052,9 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
if (params.crypto.decrypt)
params.crypto.verify = TRUE;
+ /* specifying a part implies single message display */
+ single_message = params.part >= 0;
+
if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) {
/* if part was requested and format was not specified, use format=raw */
if (params.part >= 0)
@@ -1079,10 +1083,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
break;
case NOTMUCH_FORMAT_RAW:
format = &format_raw;
- /* If --format=raw specified without specifying part, we can only
- * output single message, so set part=0 */
- if (params.part < 0)
- params.part = 0;
+ /* raw format only supports single message display */
+ single_message = TRUE;
params.raw = TRUE;
break;
}
@@ -1148,9 +1150,9 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[])
sprinter = format->new_sprinter(config, stdout);
/* If a single message is requested we do not use search_excludes. */
- if (params.part >= 0)
+ if (single_message) {
ret = do_show_single (config, query, format, sprinter, ¶ms);
- else {
+ } else {
/* We always apply set the exclude flag. The
* exclude=true|false option controls whether or not we return
* threads that only match in an excluded message */
--
2.11.0
next prev parent reply other threads:[~2017-01-06 20:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 20:14 [PATCH 0/9] cli/show: refactoring and cleanup Jani Nikula
2017-01-06 20:14 ` Jani Nikula [this message]
2017-03-11 14:06 ` [PATCH 1/9] cli/show: detangle overloading of params.part for single message display David Bremner
2017-01-06 20:14 ` [PATCH 2/9] cli/show: remove unused raw member from show parameters struct Jani Nikula
2017-01-06 20:14 ` [PATCH 3/9] cli/show: consistently use format_sel for checking the format Jani Nikula
2017-01-06 20:14 ` [PATCH 4/9] cli/show: use a table for choosing the formatter Jani Nikula
2017-01-06 20:14 ` [PATCH 5/9] cli/show: rename format_sel to simply format Jani Nikula
2017-01-06 20:14 ` [PATCH 6/9] cli/show: group --entire-thread option handling into one place Jani Nikula
2017-01-06 20:14 ` [PATCH 7/9] cli/show: move formatter structs closer to where they're needed Jani Nikula
2017-01-06 20:14 ` [PATCH 8/9] cli: simplify mime node walk Jani Nikula
2017-01-06 20:14 ` [PATCH 9/9] cli: do not initialize zero values with designated initializers Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b4443b6d35acb69e56eb675700257c54ac89b740.1483733461.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).