X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-restore.c;h=13b4325a882667b9178e432d87de14f94f1fb85c;hp=001f3fcb762c71adf20a6af7dd3ff39ea6a3eb1c;hb=7a87830f5eb32373bc17235e9d178d383830dc64;hpb=f379aa52845f5594aa6cc2e7cf131d5f57202bbf

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 001f3fcb..13b4325a 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -18,6 +18,8 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
+#include <getopt.h>
+
 #include "notmuch-client.h"
 
 int
@@ -25,7 +27,9 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 {
     notmuch_config_t *config;
     notmuch_database_t *notmuch;
-    FILE *input;
+    notmuch_bool_t synchronize_flags;
+    notmuch_bool_t accumulate = FALSE;
+    FILE *input = stdin;
     char *line = NULL;
     size_t line_size;
     ssize_t line_len;
@@ -37,35 +41,65 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 	return 1;
 
     notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
-				     NOTMUCH_DATABASE_MODE_WRITABLE);
+				     NOTMUCH_DATABASE_MODE_READ_WRITE);
     if (notmuch == NULL)
 	return 1;
 
-    if (argc) {
-	input = fopen (argv[0], "r");
+    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
+
+    struct option options[] = {
+	{ "accumulate",   no_argument,       0, 'a' },
+	{ 0, 0, 0, 0}
+    };
+
+    int opt;
+    do {
+	opt = getopt_long (argc, argv, "", options, NULL);
+
+	switch (opt) {
+	case 'a':
+	    accumulate = 1;
+	    break;
+	case '?':
+	    return 1;
+	    break;
+	}
+
+    } while (opt != -1);
+
+    if (optind < argc) {
+	input = fopen (argv[optind], "r");
 	if (input == NULL) {
 	    fprintf (stderr, "Error opening %s for reading: %s\n",
-		     argv[0], strerror (errno));
+		     argv[optind], strerror (errno));
 	    return 1;
 	}
-    } else {
-	printf ("No filename given. Reading dump from stdin.\n");
-	input = stdin;
+	optind++;
+    }
+
+    if (optind < argc) {
+	fprintf (stderr,
+	 "Cannot read dump from more than one file: %s\n",
+		 argv[optind]);
+	return 1;
     }
 
     /* 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);
+    if ( xregcomp (&regex,
+		   "^([^ ]+) \\(([^)]*)\\)$",
+		   REG_EXTENDED) )
+	INTERNAL_ERROR("compile time constant regex failed.");
 
     while ((line_len = getline (&line, &line_size, input)) != -1) {
 	regmatch_t match[3];
-	char *message_id, *tags, *tag, *next;
-	notmuch_message_t *message;
+	char *message_id, *file_tags, *tag, *next;
+	notmuch_message_t *message = NULL;
 	notmuch_status_t status;
+	notmuch_tags_t *db_tags;
+	char *db_tags_str;
 
 	chomp_newline (line);
 
@@ -79,21 +113,52 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 
 	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);
+	file_tags = xstrndup (line + match[2].rm_so,
+			      match[2].rm_eo - match[2].rm_so);
+
+	status = notmuch_database_find_message (notmuch, message_id, &message);
+	if (status || message == NULL) {
+	    fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n",
+		     message ? "" : "missing ", message_id);
+	    if (status)
+		fprintf (stderr, "%s\n",
+			 notmuch_status_to_string(status));
+	    goto NEXT_LINE;
+	}
+
+	/* In order to detect missing messages, this check/optimization is
+	 * intentionally done *after* first finding the message.  */
+	if (accumulate && (file_tags == NULL || *file_tags == '\0'))
+	{
+	    goto NEXT_LINE;
+	}
+
+	db_tags_str = NULL;
+	for (db_tags = notmuch_message_get_tags (message);
+	     notmuch_tags_valid (db_tags);
+	     notmuch_tags_move_to_next (db_tags))
+	{
+	    const char *tag = notmuch_tags_get (db_tags);
+
+	    if (db_tags_str)
+		db_tags_str = talloc_asprintf_append (db_tags_str, " %s", tag);
+	    else
+		db_tags_str = talloc_strdup (message, tag);
+	}
 
-	message = notmuch_database_find_message (notmuch, message_id);
-	if (message == NULL) {
-	    fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n",
-		     message_id);
+	if (((file_tags == NULL || *file_tags == '\0') &&
+	     (db_tags_str == NULL || *db_tags_str == '\0')) ||
+	    (file_tags && db_tags_str && strcmp (file_tags, db_tags_str) == 0))
+	{
 	    goto NEXT_LINE;
 	}
 
 	notmuch_message_freeze (message);
 
-	notmuch_message_remove_all_tags (message);
+	if (!accumulate)
+	    notmuch_message_remove_all_tags (message);
 
-	next = tags;
+	next = file_tags;
 	while (next) {
 	    tag = strsep (&next, " ");
 	    if (*tag == '\0')
@@ -109,10 +174,16 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 	}
 
 	notmuch_message_thaw (message);
-	notmuch_message_destroy (message);
+
+	if (synchronize_flags)
+	    notmuch_message_tags_to_maildir_flags (message);
+
       NEXT_LINE:
+	if (message)
+	    notmuch_message_destroy (message);
+	message = NULL;
 	free (message_id);
-	free (tags);
+	free (file_tags);
     }
 
     regfree (&regex);