mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
search --output=files: Output all filenames for each matching message
Messages in the database can have multiple files associated with a single message-id, but until now only one filename for each message has been reported by "notmuch search --output=files" Signed-off-by: Mark Anderson <ma.skies@gmail.com>
This commit is contained in:
parent
c87da6961d
commit
d752509abf
1 changed files with 22 additions and 7 deletions
|
@ -275,6 +275,7 @@ do_search_messages (const search_format_t *format,
|
||||||
{
|
{
|
||||||
notmuch_message_t *message;
|
notmuch_message_t *message;
|
||||||
notmuch_messages_t *messages;
|
notmuch_messages_t *messages;
|
||||||
|
notmuch_filenames_t *filenames;
|
||||||
int first_message = 1;
|
int first_message = 1;
|
||||||
|
|
||||||
messages = notmuch_query_search_messages (query);
|
messages = notmuch_query_search_messages (query);
|
||||||
|
@ -289,18 +290,32 @@ do_search_messages (const search_format_t *format,
|
||||||
{
|
{
|
||||||
message = notmuch_messages_get (messages);
|
message = notmuch_messages_get (messages);
|
||||||
|
|
||||||
|
if (output == OUTPUT_FILES) {
|
||||||
|
filenames = notmuch_message_get_filenames (message);
|
||||||
|
|
||||||
|
for (;
|
||||||
|
notmuch_filenames_valid (filenames);
|
||||||
|
notmuch_filenames_move_to_next (filenames))
|
||||||
|
{
|
||||||
if (! first_message)
|
if (! first_message)
|
||||||
fputs (format->item_sep, stdout);
|
fputs (format->item_sep, stdout);
|
||||||
|
|
||||||
if (output == OUTPUT_FILES) {
|
|
||||||
format->item_id (message, "",
|
format->item_id (message, "",
|
||||||
notmuch_message_get_filename (message));
|
notmuch_filenames_get (filenames));
|
||||||
} else { /* output == OUTPUT_MESSAGES */
|
|
||||||
format->item_id (message, "id:",
|
|
||||||
notmuch_message_get_message_id (message));
|
|
||||||
}
|
|
||||||
|
|
||||||
first_message = 0;
|
first_message = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
notmuch_filenames_destroy( filenames );
|
||||||
|
|
||||||
|
} else { /* output == OUTPUT_MESSAGES */
|
||||||
|
if (! first_message)
|
||||||
|
fputs (format->item_sep, stdout);
|
||||||
|
|
||||||
|
format->item_id (message, "id:",
|
||||||
|
notmuch_message_get_message_id (message));
|
||||||
|
first_message = 0;
|
||||||
|
}
|
||||||
|
|
||||||
notmuch_message_destroy (message);
|
notmuch_message_destroy (message);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue