From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 6/8] CLI: refactor dumping of tags.
Date: Sun, 12 Jun 2016 22:05:53 -0300 [thread overview]
Message-ID: <1465779955-5539-7-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1465779955-5539-1-git-send-email-david@tethera.net>
This is mainly code movement, to make room in the loop over messages for
dumping properties.
---
notmuch-dump.c | 127 +++++++++++++++++++++++++++++++--------------------------
1 file changed, 69 insertions(+), 58 deletions(-)
diff --git a/notmuch-dump.c b/notmuch-dump.c
index cae1db8..d80ed8b8 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -78,13 +78,78 @@ print_dump_header (gzFile output, int output_format, int include)
}
static int
+dump_tags_message (void *ctx,
+ notmuch_message_t *message, int output_format,
+ gzFile output,
+ char **buffer_p, size_t *size_p)
+{
+ int first = 1;
+ const char *message_id;
+
+ message_id = notmuch_message_get_message_id (message);
+
+ if (output_format == DUMP_FORMAT_BATCH_TAG &&
+ strchr (message_id, '\n')) {
+ /* This will produce a line break in the output, which
+ * would be difficult to handle in tools. However, it's
+ * also impossible to produce an email containing a line
+ * break in a message ID because of unfolding, so we can
+ * safely disallow it. */
+ fprintf (stderr, "Warning: skipping message id containing line break: \"%s\"\n", message_id);
+ return EXIT_SUCCESS;
+ }
+
+ if (output_format == DUMP_FORMAT_SUP) {
+ gzprintf (output, "%s (", message_id);
+ }
+
+ for (notmuch_tags_t *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)
+ gzputs (output, " ");
+
+ first = 0;
+
+ if (output_format == DUMP_FORMAT_SUP) {
+ gzputs (output, tag_str);
+ } else {
+ if (hex_encode (ctx, tag_str,
+ buffer_p, size_p) != HEX_SUCCESS) {
+ fprintf (stderr, "Error: failed to hex-encode tag %s\n",
+ tag_str);
+ return EXIT_FAILURE;
+ }
+ gzprintf (output, "+%s", *buffer_p);
+ }
+ }
+
+ if (output_format == DUMP_FORMAT_SUP) {
+ gzputs (output, ")\n");
+ } else {
+ if (make_boolean_term (ctx, "id", message_id,
+ buffer_p, size_p)) {
+ fprintf (stderr, "Error quoting message id %s: %s\n",
+ message_id, strerror (errno));
+ return EXIT_FAILURE;
+ }
+ gzprintf (output, " -- %s\n", *buffer_p);
+ }
+ return EXIT_SUCCESS;
+}
+
+static int
database_dump_file (notmuch_database_t *notmuch, gzFile output,
const char *query_str, int output_format, int include)
{
notmuch_query_t *query;
notmuch_messages_t *messages;
notmuch_message_t *message;
- notmuch_tags_t *tags;
+ notmuch_status_t status;
+ char *buffer = NULL;
+ size_t buffer_size = 0;
print_dump_header (output, output_format, include);
@@ -110,10 +175,6 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output,
*/
notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
- char *buffer = NULL;
- size_t buffer_size = 0;
- notmuch_status_t status;
-
status = notmuch_query_search_messages_st (query, &messages);
if (print_status_query ("notmuch dump", query, status))
return EXIT_FAILURE;
@@ -121,62 +182,12 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output,
for (;
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);
-
- if (output_format == DUMP_FORMAT_BATCH_TAG &&
- strchr (message_id, '\n')) {
- /* This will produce a line break in the output, which
- * would be difficult to handle in tools. However, it's
- * also impossible to produce an email containing a line
- * break in a message ID because of unfolding, so we can
- * safely disallow it. */
- fprintf (stderr, "Warning: skipping message id containing line break: \"%s\"\n", message_id);
- notmuch_message_destroy (message);
- continue;
- }
- if (output_format == DUMP_FORMAT_SUP) {
- gzprintf (output, "%s (", message_id);
- }
-
- 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)
- gzputs (output, " ");
-
- first = 0;
-
- if (output_format == DUMP_FORMAT_SUP) {
- gzputs (output, tag_str);
- } 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 EXIT_FAILURE;
- }
- gzprintf (output, "+%s", buffer);
- }
- }
-
- if (output_format == DUMP_FORMAT_SUP) {
- gzputs (output, ")\n");
- } else {
- if (make_boolean_term (notmuch, "id", message_id,
- &buffer, &buffer_size)) {
- fprintf (stderr, "Error quoting message id %s: %s\n",
- message_id, strerror (errno));
- return EXIT_FAILURE;
- }
- gzprintf (output, " -- %s\n", buffer);
- }
+ if (dump_tags_message (notmuch, message, output_format, output,
+ &buffer, &buffer_size))
+ return EXIT_FAILURE;
notmuch_message_destroy (message);
}
--
2.8.1
next prev parent reply other threads:[~2016-06-13 1:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 1:05 message properties patches, v1.0 David Bremner
2016-06-13 1:05 ` [PATCH 1/8] lib: read "property" terms from messages David Bremner
2016-06-13 1:05 ` [PATCH 2/8] lib: private string map (associative array) API David Bremner
2016-06-13 8:10 ` Tomi Ollila
2016-06-13 13:02 ` David Bremner
2016-06-13 15:18 ` Bijan Chokoufe Nejad
2016-06-13 1:05 ` [PATCH 3/8] lib: basic message-property API David Bremner
2016-07-08 4:36 ` [PATCH] n_m_remove_property(msg, key, NULL) should removes all properties with key Daniel Kahn Gillmor
2016-07-16 10:32 ` [PATCH] RFC: all deleting all properties with a given key David Bremner
2016-07-17 23:33 ` Daniel Kahn Gillmor
2016-06-13 1:05 ` [PATCH 4/8] lib: extend private string map API with iterators David Bremner
2016-06-13 1:05 ` [PATCH 5/8] lib: iterator API for message properties David Bremner
2016-06-13 1:05 ` David Bremner [this message]
2016-06-13 1:05 ` [PATCH 7/8] CLI: add properties to dump output David Bremner
2016-06-13 1:05 ` [PATCH 8/8] cli: optionally restore message properties from dump file David Bremner
2016-07-08 9:15 ` [PATCH] add has: query prefix to search for specific properties Daniel Kahn Gillmor
2016-07-17 0:39 ` David Bremner
2016-07-17 10:38 ` David Bremner
2016-07-17 23:44 ` Daniel Kahn Gillmor
-- strict thread matches above, loose matches on Subject: below --
2016-08-03 0:30 v2 of message properties patches David Bremner
2016-08-03 0:30 ` [PATCH 6/8] CLI: refactor dumping of tags 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=1465779955-5539-7-git-send-email-david@tethera.net \
--to=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).