From: David Bremner <bremner@debian.org> sup is the old format, and remains the default. Each line of the notmuch format is "msg_id tag tag...tag" where each space seperated token is 'hex-encoded' to remove troubling characters. 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. --- dump-restore-private.h | 20 ++++++++++++++++++++ notmuch-dump.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 dump-restore-private.h diff --git a/dump-restore-private.h b/dump-restore-private.h new file mode 100644 index 0000000..eda3219 --- /dev/null +++ b/dump-restore-private.h @@ -0,0 +1,20 @@ +#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_SUP, + DUMP_FORMAT_NOTMUCH +} dump_format_t; + +#define FORMAT_DESC(out) \ + { \ + NOTMUCH_OPT_KEYWORD, &out, "format", 'f', \ + (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP }, \ + { "notmuch", DUMP_FORMAT_NOTMUCH }, \ + {0, 0} } \ + } + +#endif diff --git a/notmuch-dump.c b/notmuch-dump.c index a735875..5f788f9 100644 --- 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[]) @@ -44,7 +45,10 @@ 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[] = { + FORMAT_DESC (output_format), { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 }, { 0, 0, 0, 0, 0 } }; @@ -85,29 +89,53 @@ 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; - message = notmuch_messages_get (messages); + const char *message_id; - fprintf (output, - "%s (", notmuch_message_get_message_id (message)); + message = notmuch_messages_get (messages); + message_id = notmuch_message_get_message_id (message); + + if (output_format == DUMP_FORMAT_SUP) { + fprintf (output, "%s (", message_id); + } else { + if (hex_encode (notmuch, message_id, + &buffer, &buffer_size) != HEX_SUCCESS) + return 1; + fprintf (output, "%s ", buffer); + } for (tags = notmuch_message_get_tags (message); notmuch_tags_valid (tags); notmuch_tags_move_to_next (tags)) { + const char *tag_str = notmuch_tags_get (tags); + if (! first) - fprintf (output, " "); + fputs (" ", output); - fprintf (output, "%s", notmuch_tags_get (tags)); + if (output_format == DUMP_FORMAT_SUP) { + fputs (tag_str, output); + } else { + if (hex_encode (notmuch, tag_str, + &buffer, &buffer_size) != HEX_SUCCESS) + return 1; + fputs (buffer, output); + } first = 0; } - fprintf (output, ")\n"); + if (output_format == DUMP_FORMAT_SUP) + fputs (")\n",output); + else + fputs ("\n", output); notmuch_message_destroy (message); } -- 1.7.5.4