From f375dce077499743c5233bb2cb992b15f48a7b40 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 8 Dec 2012 00:21:06 +0200 Subject: [PATCH] Re: [Patch v3b 1/9] notmuch-dump: add --format=(batch-tag|sup) --- c1/16af034aac3037157786971d19d934a4b536ab | 209 ++++++++++++++++++++++ 1 file changed, 209 insertions(+) create mode 100644 c1/16af034aac3037157786971d19d934a4b536ab diff --git a/c1/16af034aac3037157786971d19d934a4b536ab b/c1/16af034aac3037157786971d19d934a4b536ab new file mode 100644 index 000000000..2d5ba2ebd --- /dev/null +++ b/c1/16af034aac3037157786971d19d934a4b536ab @@ -0,0 +1,209 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 57163431FAF + for ; Fri, 7 Dec 2012 14:21:12 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 VjEnDJeUL7qT for ; + Fri, 7 Dec 2012 14:21:11 -0800 (PST) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 713C9431FAE + for ; Fri, 7 Dec 2012 14:21:11 -0800 (PST) +Received: by mail-lb0-f181.google.com with SMTP id ge1so803644lbb.26 + for ; Fri, 07 Dec 2012 14:21:09 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:in-reply-to:references:user-agent:date + :message-id:mime-version:content-type:x-gm-message-state; + bh=TmR61HfWCaUUGzHCyQax1XCknNQepPqVyDMufpCFIz0=; + b=k5IZcrMMCEJv83fcH96NChi4t1auzit3/HVJ7pHPVfUIyYdknSX1D0cgdC3k+B3qEC + FjFInKn8iMRbESXtjfQbjX+qsbL+A/ntZxy/NGtS7eMQmD2+iYtFzLVn8kUeA7cdsnlU + ja5StRX0JP/v9r8bbYVW+WgfeMs5fUH7/BTJv250hNb3oAmu6B/P96vpSEti0FwSfpxU + KPIRpRASBo2ddT7IhD9ItMd0t0R6DSzl1sHgjoSwFO1/qU/2LaOD+61HcR0sud4o31Ab + muAF/g6B2Uy9NVyPL9CQhuGV/363UrYGopEZDSUGgP11/ULKHIc41CCjfP9DihvtrKvR + zlMQ== +Received: by 10.112.11.68 with SMTP id o4mr3096487lbb.128.1354918869767; + Fri, 07 Dec 2012 14:21:09 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id oj5sm5081024lab.8.2012.12.07.14.21.07 + (version=SSLv3 cipher=OTHER); Fri, 07 Dec 2012 14:21:08 -0800 (PST) +From: Jani Nikula +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [Patch v3b 1/9] notmuch-dump: add --format=(batch-tag|sup) +In-Reply-To: <1354843607-17980-2-git-send-email-david@tethera.net> +References: <1354843607-17980-1-git-send-email-david@tethera.net> + <1354843607-17980-2-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.14+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1 + (i686-pc-linux-gnu) +Date: Sat, 08 Dec 2012 00:21:06 +0200 +Message-ID: <8738zhzep9.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQldKxD3TeDpGdMB77FlSXb7xnCq0ujcjIB3xYCPn+afTHp3ftyGUBKQ3gilR+jRW9btyd28 +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: Fri, 07 Dec 2012 22:21:12 -0000 + + +LGTM. + +On Fri, 07 Dec 2012, david@tethera.net wrote: +> From: David Bremner +> +> 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. +> --- +> dump-restore-private.h | 13 +++++++++++++ +> notmuch-dump.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ +> 2 files changed, 55 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..d2dad40 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,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); +> } +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2