Use notmuch_database_destroy instead of notmuch_database_close

[notmuch] / notmuch-dump.c

diff --git a/notmuch-dump.c b/notmuch-dump.c
index ae77338e68cd0dbc6131b1982c3f9b52aefd1819..71ab0ea73d69f44de2505099c86f605e0d3cb33e 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -23,44 +23,71 @@
 int
 notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
 {
-    FILE *output = NULL;
-    notmuch_database_t *notmuch = NULL;
+    notmuch_config_t *config;
+    notmuch_database_t *notmuch;
     notmuch_query_t *query;
+    FILE *output = stdout;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
-    int ret = 0;
+    const char* query_str = "";
 
-    if (argc) {
-       output = fopen (argv[0], "w");
+    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_READ_ONLY);
+    if (notmuch == NULL)
+       return 1;
+
+    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;
+    }
+
+    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));
-           ret = 1;
-           goto DONE;
+                    output_file_name, strerror (errno));
+           return 1;
        }
-    } else {
-       output = stdout;
     }
 
-    notmuch = notmuch_database_open (NULL);
-    if (notmuch == NULL) {
-       ret = 1;
-       goto DONE;
+
+    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;
+       }
     }
 
-    query = notmuch_query_create (notmuch, "");
+    query = notmuch_query_create (notmuch, query_str);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
-       ret = 1;
-       goto DONE;
+       return 1;
     }
-
-    notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
+    /* 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_has_more (messages);
-        notmuch_messages_advance (messages))
+        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, " ");
@@ -85,13 +112,11 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
        notmuch_message_destroy (message);
     }
 
-    notmuch_query_destroy (query);
-
-  DONE:
-    if (notmuch)
-       notmuch_database_close (notmuch);
-    if (output && output != stdout)
+    if (output != stdout)
        fclose (output);
 
-    return ret;
+    notmuch_query_destroy (query);
+    notmuch_database_destroy (notmuch);
+
+    return 0;
 }