debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add support for notmuch search --duplicate=N with --output=messages

Browse source 
Print the message IDs of all messages matching the search terms that
have at least N files associated with them.
This commit is contained in:
Jani Nikula 2014-11-01 11:31:06 +02:00 committed by David Bremner
parent 96988e35c7
commit 4366b9b88c
2 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/man1/notmuch-search.rst
View file

@ -142,10 +142,14 @@ Supported options for **search** include
rather than the number of matching messages. rather than the number of matching messages.
``--duplicate=N`` ``--duplicate=N``
Effective with ``--output=files``, output the Nth filename For ``--output=files``, output the Nth filename associated
associated with each message matching the query (N is 1-based). with each message matching the query (N is 1-based). If N is
If N is greater than the number of files associated with the greater than the number of files associated with the message,
message, don't print anything. don't print anything.
For ``--output=messages``, only output message IDs of messages
matching the search terms that have at least N filenames
associated with them.
Note that this option is orthogonal with the **folder:** search Note that this option is orthogonal with the **folder:** search
prefix. The prefix matches messages based on filenames. This prefix. The prefix matches messages based on filenames. This

35
notmuch-search.c
View file

@ -310,6 +310,24 @@ process_address_header (const search_options_t *opt, const char *value)
g_object_unref (list); g_object_unref (list);
} }
static int
_count_filenames (notmuch_message_t *message)
{
notmuch_filenames_t *filenames;
int i = 0;
filenames = notmuch_message_get_filenames (message);
while (notmuch_filenames_valid (filenames)) {
notmuch_filenames_move_to_next (filenames);
i++;
}
notmuch_filenames_destroy (filenames);
return i;
}
static int static int
do_search_messages (search_options_t *opt) do_search_messages (search_options_t *opt)
{ {
@ -357,10 +375,13 @@ do_search_messages (search_options_t *opt)
notmuch_filenames_destroy( filenames ); notmuch_filenames_destroy( filenames );
} else if (opt->output == OUTPUT_MESSAGES) { } else if (opt->output == OUTPUT_MESSAGES) {
format->set_prefix (format, "id"); /* special case 1 for speed */
format->string (format, if (opt->dupe <= 1 || opt->dupe <= _count_filenames (message)) {
notmuch_message_get_message_id (message)); format->set_prefix (format, "id");
format->separator (format); format->string (format,
notmuch_message_get_message_id (message));
format->separator (format);
}
} else { } else {
if (opt->output & OUTPUT_SENDER) { if (opt->output & OUTPUT_SENDER) {
const char *addrs; const char *addrs;
@ -503,6 +524,12 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
if (! opt.output) if (! opt.output)
opt.output = OUTPUT_SUMMARY; opt.output = OUTPUT_SUMMARY;
if (opt.output != OUTPUT_FILES && opt.output != OUTPUT_MESSAGES &&
opt.dupe != -1) {
fprintf (stderr, "Error: --duplicate=N is only supported with --output=files and --output=messages.\n");
return EXIT_FAILURE;
}
switch (format_sel) { switch (format_sel) {
case NOTMUCH_FORMAT_TEXT: case NOTMUCH_FORMAT_TEXT:
opt.format = sprinter_text_create (config, stdout); opt.format = sprinter_text_create (config, stdout);