X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-dump.c;h=71ab0ea73d69f44de2505099c86f605e0d3cb33e;hp=86570d09070d26474210f5c62f4481b3fd5e7f8c;hb=6f7469f54744656f90ce215f365d5731e16acd3c;hpb=f379aa52845f5594aa6cc2e7cf131d5f57202bbf diff --git a/notmuch-dump.c b/notmuch-dump.c index 86570d09..71ab0ea7 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -26,41 +26,68 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) notmuch_config_t *config; notmuch_database_t *notmuch; notmuch_query_t *query; - FILE *output; + FILE *output = stdout; notmuch_messages_t *messages; notmuch_message_t *message; notmuch_tags_t *tags; + const char* query_str = ""; config = notmuch_config_open (ctx, NULL, NULL); if (config == NULL) return 1; notmuch = notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READONLY); + NOTMUCH_DATABASE_MODE_READ_ONLY); if (notmuch == NULL) return 1; - query = notmuch_query_create (notmuch, ""); - if (query == NULL) { - fprintf (stderr, "Out of memory\n"); + char *output_file_name = NULL; + int opt_index; + + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 }, + { 0, 0, 0, 0, 0 } + }; + + opt_index = parse_arguments (argc, argv, options, 1); + + if (opt_index < 0) { + /* diagnostics already printed */ return 1; } - notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID); - if (argc) { - output = fopen (argv[0], "w"); + if (output_file_name) { + fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); + output = fopen (output_file_name, "w"); if (output == NULL) { fprintf (stderr, "Error opening %s for writing: %s\n", - argv[0], strerror (errno)); + output_file_name, strerror (errno)); + return 1; + } + } + + + if (opt_index < argc) { + query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index); + if (query_str == NULL) { + fprintf (stderr, "Out of memory.\n"); return 1; } - } else { - output = stdout; } - for (messages = notmuch_query_search_messages (query, 0, -1); - notmuch_messages_has_more (messages); - notmuch_messages_advance (messages)) + query = notmuch_query_create (notmuch, query_str); + if (query == NULL) { + fprintf (stderr, "Out of memory\n"); + return 1; + } + /* Don't ask xapian to sort by Message-ID. Xapian optimizes returning the + * first results quickly at the expense of total time. + */ + notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED); + + for (messages = notmuch_query_search_messages (query); + notmuch_messages_valid (messages); + notmuch_messages_move_to_next (messages)) { int first = 1; message = notmuch_messages_get (messages); @@ -69,8 +96,8 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) "%s (", notmuch_message_get_message_id (message)); for (tags = notmuch_message_get_tags (message); - notmuch_tags_has_more (tags); - notmuch_tags_advance (tags)) + notmuch_tags_valid (tags); + notmuch_tags_move_to_next (tags)) { if (! first) fprintf (output, " "); @@ -89,7 +116,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) fclose (output); notmuch_query_destroy (query); - notmuch_database_close (notmuch); + notmuch_database_destroy (notmuch); return 0; }