#include "notmuch.h"
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* for getline */
+#endif
+
+/* This is separate from notmuch-private.h because we're trying to
+ * keep notmuch.c from looking into any internals, (which helps us
+ * develop notmuch.h into a plausible library interface).
+ */
+#include "xutil.h"
+
#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
-#include <glib.h> /* GIOChannel */
+#include <talloc.h>
+
+#include <glib.h> /* g_strdup_printf */
#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
const char *usage;
} command_t;
-/* Read a line from stdin, without any line-terminator character. The
- * return value is a newly allocated string. The caller should free()
- * the string when finished with it.
- *
- * This function returns NULL if EOF is encountered before any
- * characters are input (otherwise it returns those characters).
- */
-char *
-read_line (void)
-{
- char *result = NULL;
- GError *error = NULL;
- GIOStatus g_io_status;
- gsize length;
-
- GIOChannel *channel = g_io_channel_unix_new (fileno (stdin));
-
- g_io_status = g_io_channel_read_line (channel, &result,
- &length, NULL, &error);
-
- if (g_io_status == EOF)
- goto DONE;
-
- if (g_io_status != G_IO_STATUS_NORMAL) {
- fprintf(stderr, "Read error: %s\n", error->message);
- exit (1);
- }
-
- if (length && result[length - 1] == '\n')
- result[length - 1] = '\0';
-
- DONE:
- g_io_channel_unref (channel);
- return result;
-}
-
typedef struct {
int total_messages;
int count;
struct timeval tv_start;
} add_files_state_t;
+static void
+chomp_newline (char *str)
+{
+ if (str && str[strlen(str)-1] == '\n')
+ str[strlen(str)-1] = '\0';
+}
+
/* Compute the number of seconds elapsed from start to end. */
double
tv_elapsed (struct timeval start, struct timeval end)
state->count, state->total_messages);
print_formatted_seconds ((state->total_messages - state->count) /
rate_overall);
- printf (" remaining).\r");
+ printf (" remaining). \r");
fflush (stdout);
}
{
notmuch_database_t *notmuch;
char *mail_directory, *default_path;
+ size_t line_size;
int count;
add_files_state_t add_files_state;
double elapsed;
printf ("Top-level mail directory [%s]: ", default_path);
fflush (stdout);
- mail_directory = read_line ();
+ mail_directory = NULL;
+ getline (&mail_directory, &line_size, stdin);
+ chomp_newline (mail_directory);
+
printf ("\n");
if (mail_directory == NULL || strlen (mail_directory) == 0) {
int
dump_command (int argc, char *argv[])
{
- fprintf (stderr, "Error: dump is not implemented yet.\n");
- return 1;
+ FILE *output;
+ notmuch_database_t *notmuch = NULL;
+ notmuch_query_t *query;
+ notmuch_results_t *results;
+ notmuch_message_t *message;
+ notmuch_tags_t *tags;
+ int ret = 0;
+
+ if (argc) {
+ output = fopen (argv[0], "w");
+ if (output == NULL) {
+ fprintf (stderr, "Error opening %s for writing: %s\n",
+ argv[0], strerror (errno));
+ ret = 1;
+ goto DONE;
+ }
+ } else {
+ output = stdout;
+ }
+
+ notmuch = notmuch_database_open (NULL);
+ if (notmuch == NULL) {
+ ret = 1;
+ goto DONE;
+ }
+
+ query = notmuch_query_create (notmuch, "");
+ if (query == NULL) {
+ fprintf (stderr, "Out of memory\n");
+ ret = 1;
+ goto DONE;
+ }
+
+ notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
+
+ for (results = notmuch_query_search (query);
+ notmuch_results_has_more (results);
+ notmuch_results_advance (results))
+ {
+ int first = 1;
+ message = notmuch_results_get (results);
+
+ fprintf (output,
+ "%s (", notmuch_message_get_message_id (message));
+
+ for (tags = notmuch_message_get_tags (message);
+ notmuch_tags_has_more (tags);
+ notmuch_tags_advance (tags))
+ {
+ if (! first)
+ fprintf (output, " ");
+
+ fprintf (output, "%s", notmuch_tags_get (tags));
+
+ first = 0;
+ }
+
+ fprintf (output, ")\n");
+
+ notmuch_message_destroy (message);
+ }
+
+ notmuch_query_destroy (query);
+
+ DONE:
+ if (notmuch)
+ notmuch_database_close (notmuch);
+ if (output != stdout)
+ fclose (output);
+
+ return ret;
}
int
restore_command (int argc, char *argv[])
{
- fprintf (stderr, "Error: restore is not implemented yet.\n");
- return 1;
+ FILE *input;
+ notmuch_database_t *notmuch = NULL;
+ char *line = NULL;
+ size_t line_size, line_len;
+ regex_t regex;
+ int rerr;
+ int ret = 0;
+
+ if (argc) {
+ input = fopen (argv[0], "r");
+ if (input == NULL) {
+ fprintf (stderr, "Error opening %s for reading: %s\n",
+ argv[0], strerror (errno));
+ ret = 1;
+ goto DONE;
+ }
+ } else {
+ printf ("No filename given. Reading dump from stdin.\n");
+ input = stdin;
+ }
+
+ notmuch = notmuch_database_open (NULL);
+ if (notmuch == NULL) {
+ ret = 1;
+ goto DONE;
+ }
+
+ /* Dump output is one line per message. We match a sequence of
+ * 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 ')'. */
+ xregcomp (®ex,
+ "^([^ ]+) \\(([^)]*)\\)$",
+ REG_EXTENDED);
+
+ while ((line_len = getline (&line, &line_size, input)) != -1) {
+ regmatch_t match[3];
+ char *message_id, *tags, *tag, *next;
+ notmuch_message_t *message;
+ notmuch_status_t status;
+
+ chomp_newline (line);
+
+ rerr = xregexec (®ex, line, 3, match, 0);
+ if (rerr == REG_NOMATCH)
+ {
+ fprintf (stderr, "Warning: Ignoring invalid input line: %s\n",
+ line);
+ continue;
+ }
+
+ message_id = xstrndup (line + match[1].rm_so,
+ match[1].rm_eo - match[1].rm_so);
+ tags = xstrndup (line + match[2].rm_so,
+ match[2].rm_eo - match[2].rm_so);
+
+ if (strlen (tags)) {
+
+ message = notmuch_database_find_message (notmuch, message_id);
+ if (message == NULL) {
+ fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n",
+ message_id);
+ goto NEXT_LINE;
+ }
+
+ next = tags;
+ while (next) {
+ tag = strsep (&next, " ");
+ if (*tag == '\0')
+ continue;
+ status = notmuch_message_add_tag (message, tag);
+ if (status) {
+ fprintf (stderr, "Error applying tag %s to message %s.\n",
+ tag, message_id);
+ }
+ }
+
+ notmuch_message_destroy (message);
+ }
+ NEXT_LINE:
+ free (message_id);
+ free (tags);
+ }
+
+ regfree (®ex);
+
+ DONE:
+ if (line)
+ free (line);
+ if (notmuch)
+ notmuch_database_close (notmuch);
+
+ return ret;
}
command_t commands[] = {