From: Jani Nikula <jani@nikula.org>
To: david@tethera.net, notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: Re: [Patch v2 07/17] notmuch-dump: add --format=(batch-tag|sup)
Date: Sat, 01 Dec 2012 01:37:19 +0200 [thread overview]
Message-ID: <87ip8maci8.fsf@nikula.org> (raw)
In-Reply-To: <1353792017-31459-8-git-send-email-david@tethera.net>
On Sat, 24 Nov 2012, david@tethera.net wrote:
> From: David Bremner <bremner@debian.org>
>
> sup is the old format, and remains the default, at least until
> restore is converted to parse this format.
>
> Each line of the batch- format is valid for notmuch tag, (with the
> "notmuch tag" omitted from the front of the line). The dump format
> only uses query strings of a single message-id.
Valid for notmuch tag except for the hex encoding and empty set of tags.
> Each space seperated tag/message-id 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 | 13 +++++++++++++
> notmuch-dump.c | 42 ++++++++++++++++++++++++++++++++++++------
> 2 files changed, 49 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..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 88f598a..045ca9e 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[])
> @@ -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,50 @@ 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)
> + return 1;
Maybe hex_encode errors would deserve an error message. Ditto below.
Otherwise LGTM.
BR,
Jani.
> + 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)
> + return 1;
> + fprintf (output, " -- id:%s\n", buffer);
> + }
>
> notmuch_message_destroy (message);
> }
> --
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2012-11-30 23:37 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-24 21:20 V2 of batch-tagging plus new dump/restore david
2012-11-24 21:20 ` [Patch v2 01/17] hex-escape: (en|de)code strings to/from restricted character set david
2012-11-30 21:43 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 02/17] test/hex-xcode: new test binary david
2012-11-30 21:51 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 03/17] test/hex-escaping: new test for hex escaping routines david
2012-11-30 21:59 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 04/17] test: add database routines for testing david
2012-11-30 22:21 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 05/17] test: add generator for random "stub" messages david
2012-11-30 23:18 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 06/17] test: add broken roundtrip test david
2012-11-30 23:23 ` Jani Nikula
2012-11-30 23:43 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 07/17] notmuch-dump: add --format=(batch-tag|sup) david
2012-11-30 23:37 ` Jani Nikula [this message]
2012-11-24 21:20 ` [Patch v2 08/17] util: add string-util.[ch] david
2012-11-30 23:41 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 09/17] tag-util.[ch]: New files for common tagging routines david
2012-11-24 23:27 ` Tomi Ollila
2012-11-25 1:18 ` David Bremner
2012-11-25 22:19 ` Mark Walters
2012-11-30 0:17 ` David Bremner
2012-12-01 4:30 ` Austin Clements
2012-12-01 23:28 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 10/17] cli: add support for batch tagging operations to "notmuch tag" david
2012-12-01 23:55 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 11/17] test: add test for notmuch tag --batch option david
2012-11-25 22:50 ` Mark Walters
2012-11-30 4:11 ` [PATCH] " david
2012-11-30 7:29 ` Tomi Ollila
2012-12-02 0:06 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 12/17] man: document notmuch tag --batch, --input options david
2012-11-25 22:48 ` Mark Walters
2012-12-02 13:21 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 13/17] notmuch-restore: add support for input format 'batch-tag' david
2012-12-02 13:29 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 14/17] test: update dump-restore roundtripping test for batch-tag format david
2012-11-24 23:17 ` Tomi Ollila
2012-11-25 1:16 ` [PATCH] " david
2012-11-24 21:20 ` [Patch v2 15/17] test: second set of dump/restore --format=batch-tag tests david
2012-11-24 21:20 ` [Patch v2 16/17] notmuch-{dump, restore}.1: document new format options david
2012-12-02 13:40 ` Jani Nikula
2012-11-24 21:20 ` [Patch v2 17/17] tag-util: optimization of tag application david
2012-12-02 14:42 ` Jani Nikula
2012-12-02 14:47 ` V2 of batch-tagging plus new dump/restore Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ip8maci8.fsf@nikula.org \
--to=jani@nikula.org \
--cc=bremner@debian.org \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).