notmuch-dump: add --format=(batch-tag|sup)

sup is the old format, and remains the default, at least until
restore is converted to parse this format.

Each line of the batch-tag format is modelled on the syntax of notmuch tag:
- "notmuch tag" is omitted from the front of the line
- The dump format only uses query strings of a single message-id.
- Each space seperated tag/message-id is 'hex-encoded' to remove
  trouble-making characters.
- It is permitted (and will be useful) for there to be no tags before
  the query.

In particular this format won't have the same problem with e.g. spaces
in message-ids or tags; they will be round-trip-able.

diff --git a/dump-restore-private.h b/dump-restore-private.h
new file mode 100644 (file)
index 0000000..896a004
--- /dev/null
+++ b/dump-restore-private.h
@@ -0,0 +1,13 @@
+#ifndef DUMP_RESTORE_PRIVATE_H
+#define DUMP_RESTORE_PRIVATE_H
+
+#include "hex-escape.h"
+#include "command-line-arguments.h"
+
+typedef enum dump_formats {
+    DUMP_FORMAT_AUTO,
+    DUMP_FORMAT_BATCH_TAG,
+    DUMP_FORMAT_SUP
+} dump_format_t;
+
+#endif

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 88f598a2557926661adbbb56045952dddb2111f4..d2dad40da22f2943545aa475d178e65d1e29c79b 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -19,6 +19,7 @@
  */
 
 #include "notmuch-client.h"
+#include "dump-restore-private.h"
 
 int
 notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
@@ -43,7 +44,13 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     char *output_file_name = NULL;
     int opt_index;
 
+    int output_format = DUMP_FORMAT_SUP;
+
     notmuch_opt_desc_t options[] = {
+       { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f',
+         (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP },
+                                 { "batch-tag", DUMP_FORMAT_BATCH_TAG },
+                                 { 0, 0 } } },
        { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0  },
        { 0, 0, 0, 0, 0 }
     };
@@ -83,27 +90,56 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
      */
     notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
 
+    char *buffer = NULL;
+    size_t buffer_size = 0;
+
     for (messages = notmuch_query_search_messages (query);
         notmuch_messages_valid (messages);
         notmuch_messages_move_to_next (messages)) {
        int first = 1;
+       const char *message_id;
+
        message = notmuch_messages_get (messages);
+       message_id = notmuch_message_get_message_id (message);
 
-       fprintf (output,
-                "%s (", notmuch_message_get_message_id (message));
+       if (output_format == DUMP_FORMAT_SUP) {
+           fprintf (output, "%s (", message_id);
+       }
 
        for (tags = notmuch_message_get_tags (message);
             notmuch_tags_valid (tags);
             notmuch_tags_move_to_next (tags)) {
-           if (! first)
-               fprintf (output, " ");
+           const char *tag_str = notmuch_tags_get (tags);
 
-           fprintf (output, "%s", notmuch_tags_get (tags));
+           if (! first)
+               fputs (" ", output);
 
            first = 0;
+
+           if (output_format == DUMP_FORMAT_SUP) {
+               fputs (tag_str, output);
+           } else {
+               if (hex_encode (notmuch, tag_str,
+                               &buffer, &buffer_size) != HEX_SUCCESS) {
+                   fprintf (stderr, "Error: failed to hex-encode tag %s\n",
+                            tag_str);
+                   return 1;
+               }
+               fprintf (output, "+%s", buffer);
+           }
        }
 
-       fprintf (output, ")\n");
+       if (output_format == DUMP_FORMAT_SUP) {
+           fputs (")\n", output);
+       } else {
+           if (hex_encode (notmuch, message_id,
+                           &buffer, &buffer_size) != HEX_SUCCESS) {
+                   fprintf (stderr, "Error: failed to hex-encode msg-id %s\n",
+                            message_id);
+                   return 1;
+           }
+           fprintf (output, " -- id:%s\n", buffer);
+       }
 
        notmuch_message_destroy (message);
     }