X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=279d21a58013be7cff1e5547d42addd35034e3f8;hp=cedfebce4c029159cfa23f8960757f7006758200;hb=edd37e68a96ada9187976dd0421b3f545fffbf78;hpb=466a7bbf620e4bf1b57097a6d3c474159c475b6d

diff --git a/notmuch.c b/notmuch.c
index cedfebce..279d21a5 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -18,17 +18,21 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "notmuch.h"
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* for getline */
 #endif
-
 #include <stdio.h>
-#include <stdlib.h>
+
+#include "notmuch.h"
+
+/* 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 <stddef.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -55,6 +59,13 @@ typedef struct {
     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)
@@ -99,7 +110,7 @@ add_files_print_progress (add_files_state_t *state)
 	    state->count, state->total_messages);
     print_formatted_seconds ((state->total_messages - state->count) /
 			     rate_overall);
-    printf (" remaining).\r");
+    printf (" remaining).      \r");
 
     fflush (stdout);
 }
@@ -289,13 +300,9 @@ setup_command (int argc, char *argv[])
 
     mail_directory = NULL;
     getline (&mail_directory, &line_size, stdin);
-    printf ("\n");
+    chomp_newline (mail_directory);
 
-    if (mail_directory &&
-	mail_directory[strlen(mail_directory)-1] == '\n')
-    {
-	mail_directory[strlen(mail_directory)-1] = '\0';
-    }
+    printf ("\n");
 
     if (mail_directory == NULL || strlen (mail_directory) == 0) {
 	if (mail_directory)
@@ -384,7 +391,7 @@ dump_command (int argc, char *argv[])
 	output = fopen (argv[0], "w");
 	if (output == NULL) {
 	    fprintf (stderr, "Error opening %s for writing: %s\n",
-		     argv[1], strerror (errno));
+		     argv[0], strerror (errno));
 	    ret = 1;
 	    goto DONE;
 	}
@@ -398,7 +405,7 @@ dump_command (int argc, char *argv[])
 	goto DONE;
     }
 
-    query = notmuch_query_create (notmuch, NOTMUCH_QUERY_ALL);
+    query = notmuch_query_create (notmuch, "");
     if (query == NULL) {
 	fprintf (stderr, "Out of memory\n");
 	ret = 1;
@@ -411,6 +418,7 @@ dump_command (int argc, char *argv[])
 	 notmuch_results_has_more (results);
 	 notmuch_results_advance (results))
     {
+	int first = 1;
 	message = notmuch_results_get (results);
 
 	fprintf (output,
@@ -420,8 +428,6 @@ dump_command (int argc, char *argv[])
 	     notmuch_tags_has_more (tags);
 	     notmuch_tags_advance (tags))
 	{
-	    int first = 1;
-
 	    if (! first)
 		fprintf (output, " ");
 
@@ -431,6 +437,8 @@ dump_command (int argc, char *argv[])
 	}
 
 	fprintf (output, ")\n");
+
+	notmuch_message_destroy (message);
     }
 
     notmuch_query_destroy (query);
@@ -447,8 +455,107 @@ dump_command (int argc, char *argv[])
 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 (&regex,
+	      "^([^ ]+) \\(([^)]*)\\)$",
+	      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 (&regex, 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 (",
+			 message_id);
+	    }
+
+	    next = tags;
+	    while (next) {
+		tag = strsep (&next, " ");
+		if (*tag == '\0')
+		    continue;
+		if (message) {
+		    status = notmuch_message_add_tag (message, tag);
+		    if (status) {
+			fprintf (stderr,
+				 "Error applying tag %s to message %s:\n",
+				 tag, message_id);
+			fprintf (stderr, "%s\n",
+				 notmuch_status_to_string (status));
+		    }
+		} else {
+		    fprintf (stderr, "%s ", tag);
+		}
+	    }
+
+	    if (message)
+		notmuch_message_destroy (message);
+	    else
+		fprintf (stderr, ")\n");
+	}
+	free (message_id);
+	free (tags);
+    }
+
+    regfree (&regex);
+
+  DONE:
+    if (line)
+	free (line);
+    if (notmuch)
+	notmuch_database_close (notmuch);
+
+    return ret;
 }
 
 command_t commands[] = {