1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id BA4AF431FC0
\r
6 for <notmuch@notmuchmail.org>; Sun, 23 Dec 2012 17:40:09 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Kdjwz4+74QB2 for <notmuch@notmuchmail.org>;
\r
16 Sun, 23 Dec 2012 17:40:07 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 86280431FC2
\r
21 for <notmuch@notmuchmail.org>; Sun, 23 Dec 2012 17:40:02 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.82.78] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1Tmx1M-0008Kq-Ay; Sun, 23 Dec 2012 21:40:00 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Tmx1G-0002nl-NS; Sun, 23 Dec 2012 21:39:54 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v9 07/17] notmuch-restore: move query handling for batch
\r
35 Date: Sun, 23 Dec 2012 21:39:33 -0400
\r
36 Message-Id: <1356313183-9266-8-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1356313183-9266-1-git-send-email-david@tethera.net>
\r
39 References: <1356313183-9266-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Mon, 24 Dec 2012 01:40:10 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 We are able to detect more errors by looking at the string before it
\r
59 is hex-decoded. We also need this to avoid the query quoting for more
\r
60 general queries (to be written) that will mess up raw message-ids.
\r
62 notmuch-restore.c | 19 ++-----------------
\r
63 tag-util.c | 26 ++++++++++++++++++++------
\r
64 tag-util.h | 7 ++++++-
\r
65 test/dump-restore | 5 ++---
\r
66 4 files changed, 30 insertions(+), 27 deletions(-)
\r
68 diff --git a/notmuch-restore.c b/notmuch-restore.c
\r
69 index 9ed9b51..8a885de 100644
\r
70 --- a/notmuch-restore.c
\r
71 +++ b/notmuch-restore.c
\r
72 @@ -216,24 +216,9 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
\r
73 if (input_format == DUMP_FORMAT_SUP) {
\r
74 ret = parse_sup_line (line_ctx, line, &query_string, tag_ops);
\r
76 - ret = parse_tag_line (line_ctx, line, TAG_FLAG_BE_GENEROUS,
\r
77 + ret = parse_tag_line (line_ctx, line,
\r
78 + TAG_FLAG_BE_GENEROUS | TAG_FLAG_ID_DIRECT,
\r
79 &query_string, tag_ops);
\r
82 - if (strncmp ("id:", query_string, 3) != 0) {
\r
83 - fprintf (stderr, "Warning: unsupported query: %s\n", query_string);
\r
86 - /* delete id: from front of string; tag_message
\r
87 - * expects a raw message-id.
\r
89 - * XXX: Note that query string id:foo and bar will be
\r
90 - * interpreted as a message id "foo and bar". This
\r
91 - * should eventually be fixed to give a better error
\r
94 - query_string = query_string + 3;
\r
99 diff --git a/tag-util.c b/tag-util.c
\r
100 index b9b6099..277eb45 100644
\r
103 @@ -245,14 +245,28 @@ parse_tag_line (void *ctx, char *line,
\r
106 /* tok now points to the query string */
\r
107 - if (hex_decode_inplace (tok) != HEX_SUCCESS) {
\r
108 - ret = line_error (TAG_PARSE_INVALID, line_for_error,
\r
109 - "hex decoding of query %s failed", tok);
\r
111 + if (flags & TAG_FLAG_ID_DIRECT) {
\r
112 + /* this is under the assumption that any whitespace in the
\r
113 + * message-id must be hex-encoded. The check is probably not
\r
114 + * perfect for exotic unicode whitespace; as fallback the
\r
115 + * search for strange message-ids will fail */
\r
116 + if ((strncmp ("id:", tok, 3) != 0) ||
\r
117 + (strcspn (tok, " \t") < strlen (tok))) {
\r
118 + ret = line_error (TAG_PARSE_INVALID, line_for_error,
\r
119 + "query '%s' is not 'id:<message-id>'", tok);
\r
122 + if (hex_decode_inplace (tok) != HEX_SUCCESS) {
\r
123 + ret = line_error (TAG_PARSE_INVALID, line_for_error,
\r
124 + "hex decoding of query %s failed", tok);
\r
128 + *query_string = tok + 3;
\r
130 + ret = unhex_and_quote (ctx, tok, line_for_error, query_string);
\r
133 - *query_string = tok;
\r
136 talloc_free (line_for_error);
\r
138 diff --git a/tag-util.h b/tag-util.h
\r
139 index 246de85..e5c7a1f 100644
\r
142 @@ -26,7 +26,12 @@ typedef enum {
\r
143 /* Accept strange tags that might be user error;
\r
144 * intended for use by notmuch-restore.
\r
146 - TAG_FLAG_BE_GENEROUS = (1 << 3)
\r
147 + TAG_FLAG_BE_GENEROUS = (1 << 3),
\r
149 + /* Directly look up messages by hex-decoded message-id, rather
\r
150 + * than parsing a general query. The query MUST be of the form
\r
151 + * id:$message-id. */
\r
152 + TAG_FLAG_ID_DIRECT = (1 << 4)
\r
156 diff --git a/test/dump-restore b/test/dump-restore
\r
157 index 6a989b6..eb7933a 100755
\r
158 --- a/test/dump-restore
\r
159 +++ b/test/dump-restore
\r
160 @@ -199,19 +199,18 @@ a
\r
161 # the next non-comment line should report an an empty tag error for
\r
162 # batch tagging, but not for restore
\r
163 + +e -- id:20091117232137.GA7669@griffis1.net
\r
164 -# highlight the sketchy id parsing; this should be last
\r
165 +g -- id:foo and bar
\r
168 cat <<EOF > EXPECTED
\r
169 -Warning: unsupported query: a
\r
170 +Warning: query 'a' is not 'id:<message-id>' [a]
\r
171 Warning: no query string [+0]
\r
172 Warning: no query string [+a +b]
\r
173 Warning: missing query string [+a +b ]
\r
174 Warning: no query string after -- [+c +d --]
\r
175 Warning: hex decoding of tag %zz failed [+%zz -- id:whatever]
\r
176 Warning: hex decoding of query id:%yy failed [+e +f id:%yy]
\r
177 -Warning: cannot apply tags to missing message: foo and bar
\r
178 +Warning: query 'id:foo and bar' is not 'id:<message-id>' [+g -- id:foo and bar]
\r
181 test_expect_equal_file EXPECTED OUTPUT
\r