From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH Draft 2 6/9] notmuch-restore: add --format=notmuch support
Date: Sun, 18 Dec 2011 09:15:08 -0400 [thread overview]
Message-ID: <1324214111-32079-7-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1324214111-32079-1-git-send-email-david@tethera.net>
From: David Bremner <bremner@debian.org>
This is format is whitespace separated tokens, encoded by
util/hex-escape.c
---
notmuch-restore.c | 81 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/notmuch-restore.c b/notmuch-restore.c
index 87d9772..f618b47 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -19,6 +19,7 @@
*/
#include "notmuch-client.h"
+#include "dump-restore-private.h"
int
notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
@@ -35,6 +36,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
regex_t regex;
int rerr;
int opt_index;
+ int input_format = DUMP_FORMAT_SUP;
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
@@ -48,6 +50,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
notmuch_opt_desc_t options[] = {
+ FORMAT_DESC (input_format),
{ NOTMUCH_OPT_POSITION, &input_file_name, 0, 0, 0 },
{ NOTMUCH_OPT_BOOLEAN, &accumulate, "accumulate", 'a', 0 },
{ 0, 0, 0, 0, 0 }
@@ -81,33 +84,63 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
* non-space characters for the message-id, then one or more
* spaces, then a list of space-separated tags as a sequence of
* characters within literal '(' and ')'. */
- if ( xregcomp (®ex,
- "^([^ ]+) \\(([^)]*)\\)$",
- REG_EXTENDED) )
- INTERNAL_ERROR("compile time constant regex failed.");
+ if (input_format == DUMP_FORMAT_SUP) {
+ if ( xregcomp (®ex,
+ "^([^ ]+) \\(([^)]*)\\)$",
+ REG_EXTENDED) )
+ INTERNAL_ERROR("compile time constant regex failed.");
+ }
+
+
+ /* These are out here to re-use the buffers with hex_decode */
+
+ char *message_id = NULL;
+ size_t message_id_size = 0;
+ char *tag = NULL;
+ size_t tag_size = 0;
while ((line_len = getline (&line, &line_size, input)) != -1) {
regmatch_t match[3];
- char *message_id, *file_tags, *tag, *next;
+ char *file_tags, *next;
notmuch_message_t *message = NULL;
+
notmuch_status_t status;
notmuch_tags_t *db_tags;
char *db_tags_str;
chomp_newline (line);
- rerr = xregexec (®ex, line, 3, match, 0);
- if (rerr == REG_NOMATCH)
- {
- fprintf (stderr, "Warning: Ignoring invalid input line: %s\n",
- line);
+ /* Silently ignore blank lines */
+
+ if (line[0] == '\0') {
continue;
}
- message_id = xstrndup (line + match[1].rm_so,
- match[1].rm_eo - match[1].rm_so);
- file_tags = xstrndup (line + match[2].rm_so,
- match[2].rm_eo - match[2].rm_so);
+ if (input_format == DUMP_FORMAT_SUP) {
+ rerr = xregexec (®ex, line, 3, match, 0);
+ if (rerr == REG_NOMATCH)
+ {
+ fprintf (stderr, "Warning: Ignoring invalid input line: %s\n",
+ line);
+ continue;
+ }
+ message_id = talloc_strndup (notmuch, line + match[1].rm_so,
+ match[1].rm_eo - match[1].rm_so);
+ file_tags = talloc_strndup (notmuch, line + match[2].rm_so,
+ match[2].rm_eo - match[2].rm_so);
+ } else {
+ char *p = line;
+ char *raw_mid;
+
+ raw_mid = strsep (&p, " \t");
+
+ if (hex_decode (notmuch, raw_mid,
+ &message_id, &message_id_size) != HEX_SUCCESS)
+ return 1;
+
+ file_tags = xstrdup (p);
+ }
+
status = notmuch_database_find_message (notmuch, message_id, &message);
if (status || message == NULL) {
@@ -153,7 +186,16 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
next = file_tags;
while (next) {
- tag = strsep (&next, " ");
+ char *raw_tag = strsep (&next, " ");
+
+ if (input_format == DUMP_FORMAT_NOTMUCH) {
+ if (hex_decode (notmuch, raw_tag,
+ &tag, &tag_size) != HEX_SUCCESS)
+ return 1;
+ } else {
+ tag = talloc_strdup (notmuch, raw_tag);
+ }
+
if (*tag == '\0')
continue;
status = notmuch_message_add_tag (message, tag);
@@ -175,11 +217,14 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if (message)
notmuch_message_destroy (message);
message = NULL;
- free (message_id);
- free (file_tags);
+ if (input_format == DUMP_FORMAT_SUP) {
+ talloc_free (message_id);
+ talloc_free (file_tags);
+ }
}
- regfree (®ex);
+ if (input_format == DUMP_FORMAT_SUP)
+ regfree (®ex);
if (line)
free (line);
--
1.7.7.3
next prev parent reply other threads:[~2011-12-18 13:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <id:87sjkmuck7.fsf@gmail.com>
2011-12-18 13:15 ` Revised dump-restore patches David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 1/9] hex-escape: (en|de)code strings to/from restricted character set David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 2/9] test/hex-xcode: new test binary David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 3/9] test/hex-escaping: new test for hex escaping routines David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 4/9] notmuch-dump: add --format=(notmuch|sup) David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 5/9] test: add test for dump --format=notmuch David Bremner
2011-12-18 13:15 ` David Bremner [this message]
2011-12-18 13:15 ` [PATCH Draft 2 7/9] test: second set of dump/restore --format=notmuch tests David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 8/9] notmuch-restore: auto detect format of backup David Bremner
2011-12-18 13:15 ` [PATCH Draft 2 9/9] test: add tests for restore --auto David Bremner
2011-12-18 20:51 ` Revised dump-restore patches Jameson Graef Rollins
2011-12-18 22:09 ` David Bremner
2012-01-15 1:40 ` New dump/restore format David Bremner
2012-01-15 1:40 ` [PATCH v3 01/10] hex-escape: (en|de)code strings to/from restricted character set David Bremner
2012-01-15 1:40 ` [PATCH v3 02/10] test/hex-xcode: new test binary David Bremner
2012-01-15 1:40 ` [PATCH v3 03/10] test/hex-escaping: new test for hex escaping routines David Bremner
2012-01-15 1:40 ` [PATCH v3 04/10] notmuch-dump: add --format=(notmuch|sup) David Bremner
2012-01-15 20:35 ` Austin Clements
2012-01-15 23:40 ` David Bremner
2012-01-15 1:40 ` [PATCH v3 05/10] test: add test for dump --format=notmuch David Bremner
2012-01-15 1:40 ` [PATCH v3 06/10] notmuch-restore: add 'notmuch format' support, auto detect David Bremner
2012-01-15 1:40 ` [PATCH v3 07/10] test: second set of dump/restore --format=notmuch tests David Bremner
2012-01-15 1:40 ` [PATCH v3 08/10] notmuch-{dump, restore}.1: document new format options David Bremner
2012-01-15 1:40 ` [PATCH v3 09/10] random-dump.c: new test-binary to generate dump files David Bremner
2012-01-15 8:05 ` Jani Nikula
2012-01-15 13:44 ` David Bremner
2012-02-05 1:04 ` Mark Walters
2012-01-15 1:40 ` [PATCH v3 10/10] test: new random message-id and tags dump/restore test David Bremner
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=1324214111-32079-7-git-send-email-david@tethera.net \
--to=david@tethera.net \
--cc=bremner@debian.org \
--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).