From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 75C2B414395 for ; Sat, 14 Jan 2012 17:40:59 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9vgB10xBdI2A for ; Sat, 14 Jan 2012 17:40:58 -0800 (PST) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 3BCB941439B for ; Sat, 14 Jan 2012 17:40:52 -0800 (PST) Received: from zancas.localnet (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net [156.34.76.32]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0F1efRY008570 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sat, 14 Jan 2012 21:40:44 -0400 Received: from bremner by zancas.localnet with local (Exim 4.77) (envelope-from ) id 1RmF5N-00042p-7r; Sat, 14 Jan 2012 21:40:41 -0400 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v3 04/10] notmuch-dump: add --format=(notmuch|sup) Date: Sat, 14 Jan 2012 21:40:18 -0400 Message-Id: <1326591624-15493-5-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1326591624-15493-1-git-send-email-david@tethera.net> References: <874nwxbkhr.fsf@zancas.localnet> <1326591624-15493-1-git-send-email-david@tethera.net> Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2012 01:40:59 -0000 From: David Bremner 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 | 12 ++++++++++++ notmuch-dump.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 8 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..34a5022 --- /dev/null +++ b/dump-restore-private.h @@ -0,0 +1,12 @@ +#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; + +#endif diff --git a/notmuch-dump.c b/notmuch-dump.c index a735875..0231db2 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,9 +45,15 @@ 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_POSITION, &output_file_name, 0, 0, 0 }, - { 0, 0, 0, 0, 0 } + { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f', + (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP }, + { "notmuch", DUMP_FORMAT_NOTMUCH }, + {0, 0} } }, + { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 }, + { 0, 0, 0, 0, 0 } }; opt_index = parse_arguments (argc, argv, options, 1); @@ -85,29 +92,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.7.3