From: Michal Sojka <sojkam1@fel.cvut.cz>
To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH v4 1/6] cli: search: Refactor passing of command line options
Date: Thu, 30 Oct 2014 22:14:04 +0100 [thread overview]
Message-ID: <878ujxclb7.fsf@steelpick.2x.cz> (raw)
In-Reply-To: <87k33iuh0m.fsf@qmul.ac.uk>
Hi Mark,
On Thu, Oct 30 2014, Mark Walters wrote:
> Hi
>
> On Mon, 27 Oct 2014, Michal Sojka <sojkam1@fel.cvut.cz> wrote:
>> Many functions that implement the search command need to access command
>> line options. Instead of passing each option in a separate variable, put
>> them in a structure and pass only this structure.
>>
>> This will become handy in the following patches.
>> ---
>> notmuch-search.c | 125 ++++++++++++++++++++++++++++---------------------------
>> 1 file changed, 64 insertions(+), 61 deletions(-)
>>
>> diff --git a/notmuch-search.c b/notmuch-search.c
>> index bc9be45..0c3e972 100644
>> --- a/notmuch-search.c
>> +++ b/notmuch-search.c
>> @@ -30,6 +30,16 @@ typedef enum {
>> OUTPUT_TAGS
>> } output_t;
>>
>> +typedef struct {
>> + sprinter_t *format;
>> + notmuch_query_t *query;
>> + notmuch_sort_t sort;
>> + output_t output;
>> + int offset;
>> + int limit;
>> + int dupe;
>> +} search_options_t;
>> +
>> /* Return two stable query strings that identify exactly the matched
>> * and unmatched messages currently in thread. If there are no
>> * matched or unmatched messages, the returned buffers will be
>> @@ -70,43 +80,39 @@ get_thread_query (notmuch_thread_t *thread,
>> }
>>
>> static int
>> -do_search_threads (sprinter_t *format,
>> - notmuch_query_t *query,
>> - notmuch_sort_t sort,
>> - output_t output,
>> - int offset,
>> - int limit)
>> +do_search_threads (search_options_t *opt)
>> {
>> notmuch_thread_t *thread;
>> notmuch_threads_t *threads;
>> notmuch_tags_t *tags;
>> + sprinter_t *format = opt->format;
>> time_t date;
>> int i;
>>
>> - if (offset < 0) {
>> - offset += notmuch_query_count_threads (query);
>> - if (offset < 0)
>> - offset = 0;
>> + if (opt->offset < 0) {
>> + opt->offset += notmuch_query_count_threads (opt->query);
>> + if (opt->offset < 0)
>> + opt->offset = 0;
>> }
>>
>> - threads = notmuch_query_search_threads (query);
>> + threads = notmuch_query_search_threads (opt->query);
>> if (threads == NULL)
>> return 1;
>>
>> format->begin_list (format);
>>
>> for (i = 0;
>> - notmuch_threads_valid (threads) && (limit < 0 || i < offset + limit);
>> + notmuch_threads_valid (threads) && (opt->limit < 0 || i < opt->offset + opt->limit);
>> notmuch_threads_move_to_next (threads), i++)
>> {
>> thread = notmuch_threads_get (threads);
>>
>> - if (i < offset) {
>> + if (i < opt->offset) {
>> notmuch_thread_destroy (thread);
>> continue;
>> }
>>
>> - if (output == OUTPUT_THREADS) {
>> + if (opt->output == OUTPUT_THREADS) {
>> format->set_prefix (format, "thread");
>> format->string (format,
>> notmuch_thread_get_thread_id (thread));
>> @@ -123,7 +129,7 @@ do_search_threads (sprinter_t *format,
>>
>> format->begin_map (format);
>>
>> - if (sort == NOTMUCH_SORT_OLDEST_FIRST)
>> + if (opt->sort == NOTMUCH_SORT_OLDEST_FIRST)
>> date = notmuch_thread_get_oldest_date (thread);
>> else
>> date = notmuch_thread_get_newest_date (thread);
>> @@ -215,40 +221,36 @@ do_search_threads (sprinter_t *format,
>> }
>>
>> static int
>> -do_search_messages (sprinter_t *format,
>> - notmuch_query_t *query,
>> - output_t output,
>> - int offset,
>> - int limit,
>> - int dupe)
>> +do_search_messages (search_options_t *opt)
>> {
>> notmuch_message_t *message;
>> notmuch_messages_t *messages;
>> notmuch_filenames_t *filenames;
>> + sprinter_t *format = opt->format;
>> int i;
>>
>> - if (offset < 0) {
>> - offset += notmuch_query_count_messages (query);
>> - if (offset < 0)
>> - offset = 0;
>> + if (opt->offset < 0) {
>> + opt->offset += notmuch_query_count_messages (opt->query);
>> + if (opt->offset < 0)
>> + opt->offset = 0;
>> }
>>
>> - messages = notmuch_query_search_messages (query);
>> + messages = notmuch_query_search_messages (opt->query);
>> if (messages == NULL)
>> return 1;
>>
>> format->begin_list (format);
>>
>> for (i = 0;
>> - notmuch_messages_valid (messages) && (limit < 0 || i < offset + limit);
>> + notmuch_messages_valid (messages) && (opt->limit < 0 || i < opt->offset + opt->limit);
>> notmuch_messages_move_to_next (messages), i++)
>> {
>> - if (i < offset)
>> + if (i < opt->offset)
>> continue;
>>
>> message = notmuch_messages_get (messages);
>>
>> - if (output == OUTPUT_FILES) {
>> + if (opt->output == OUTPUT_FILES) {
>> int j;
>> filenames = notmuch_message_get_filenames (message);
>>
>> @@ -256,7 +258,7 @@ do_search_messages (sprinter_t *format,
>> notmuch_filenames_valid (filenames);
>> notmuch_filenames_move_to_next (filenames), j++)
>> {
>> - if (dupe < 0 || dupe == j) {
>> + if (opt->dupe < 0 || opt->dupe == j) {
>> format->string (format, notmuch_filenames_get (filenames));
>> format->separator (format);
>> }
>> @@ -283,12 +285,13 @@ do_search_messages (sprinter_t *format,
>>
>> static int
>> do_search_tags (notmuch_database_t *notmuch,
>> - sprinter_t *format,
>> - notmuch_query_t *query)
>> + const search_options_t *opt)
>> {
>
> What about leaving out the *notmuch argument and getting that from the
> query (query->notmuch I think)?
I was also thinking about this, but notmuch_query_t is an opaque
structure which means that we would need a getter function in the
library. I think it is simpler to have it this way.
-Michal
next prev parent reply other threads:[~2014-10-30 21:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 14:50 [PATCH v4 0/6] notmuch search --output=sender/recipients Michal Sojka
2014-10-27 14:50 ` [PATCH v4 1/6] cli: search: Refactor passing of command line options Michal Sojka
2014-10-30 7:57 ` Mark Walters
2014-10-30 21:14 ` Michal Sojka [this message]
2014-10-27 14:50 ` [PATCH v4 2/6] cli: Add support for parsing keyword-flag arguments Michal Sojka
2014-10-27 14:50 ` [PATCH v4 3/6] cli: search: Convert --output to keyword-flag argument Michal Sojka
2014-10-27 14:50 ` [PATCH v4 4/6] cli: search: Add --output={sender,recipients} Michal Sojka
2014-10-30 8:10 ` Mark Walters
2014-10-27 14:50 ` [PATCH v4 5/6] cli: search: Add configurable way to filter out duplicate addresses Michal Sojka
2014-10-30 8:16 ` Mark Walters
2014-10-30 8:52 ` Tomi Ollila
2014-10-30 9:00 ` Mark Walters
2014-10-30 21:42 ` Michal Sojka
2014-10-30 21:34 ` Michal Sojka
2014-10-27 14:50 ` [PATCH v4 6/6] cli: search: Add --output=count Michal Sojka
2014-10-28 21:19 ` [PATCH v4 0/6] notmuch search --output=sender/recipients Tomi Ollila
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=878ujxclb7.fsf@steelpick.2x.cz \
--to=sojkam1@fel.cvut.cz \
--cc=markwalters1009@gmail.com \
--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).