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

cli: add --duplicate=N option to notmuch search

Browse source 
Effective with --output=files, output the Nth filename associated with
each message matching the query (N is 1-based). If N is greater than
the number of files associated with the message, don't print anything.
This commit is contained in:
Jani Nikula 2013-08-17 15:11:26 +03:00 committed by David Bremner
parent d416294ae8
commit cc4fb2c172
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
notmuch-search.c
View file

@ -177,7 +177,8 @@ do_search_messages (sprinter_t *format,
notmuch_query_t *query, notmuch_query_t *query,
output_t output, output_t output,
int offset, int offset,
int limit) int limit,
int dupe)
{ {
notmuch_message_t *message; notmuch_message_t *message;
notmuch_messages_t *messages; notmuch_messages_t *messages;
@ -206,14 +207,17 @@ do_search_messages (sprinter_t *format,
message = notmuch_messages_get (messages); message = notmuch_messages_get (messages);
if (output == OUTPUT_FILES) { if (output == OUTPUT_FILES) {
int j;
filenames = notmuch_message_get_filenames (message); filenames = notmuch_message_get_filenames (message);
for (; for (j = 1;
notmuch_filenames_valid (filenames); notmuch_filenames_valid (filenames);
notmuch_filenames_move_to_next (filenames)) notmuch_filenames_move_to_next (filenames), j++)
{ {
format->string (format, notmuch_filenames_get (filenames)); if (dupe < 0 || dupe == j) {
format->separator (format); format->string (format, notmuch_filenames_get (filenames));
format->separator (format);
}
} }
notmuch_filenames_destroy( filenames ); notmuch_filenames_destroy( filenames );
@ -296,6 +300,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
int offset = 0; int offset = 0;
int limit = -1; /* unlimited */ int limit = -1; /* unlimited */
notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE; notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE;
int dupe = -1;
unsigned int i; unsigned int i;
enum { enum {
@ -332,6 +337,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },
{ NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },
{ NOTMUCH_OPT_INT, &dupe, "duplicate", 'D', 0 },
{ 0, 0, 0, 0, 0 } { 0, 0, 0, 0, 0 }
}; };
@ -414,7 +420,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
break; break;
case OUTPUT_MESSAGES: case OUTPUT_MESSAGES:
case OUTPUT_FILES: case OUTPUT_FILES:
ret = do_search_messages (format, query, output, offset, limit); ret = do_search_messages (format, query, output, offset, limit, dupe);
break; break;
case OUTPUT_TAGS: case OUTPUT_TAGS:
ret = do_search_tags (notmuch, format, query); ret = do_search_tags (notmuch, format, query);