Avoid abbreviation, preferring notmuch_config_get_maildir_synchronize_flags

[notmuch] / notmuch-restore.c

diff --git a/notmuch-restore.c b/notmuch-restore.c
index b8f99a39f90bf0a8d951df8750f867ce453305f9..98660b32cf0257b95da65450e37e4c080ca49b5e 100644 (file)
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -36,10 +36,13 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
     if (config == NULL)
        return 1;
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
+    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+                                    NOTMUCH_DATABASE_MODE_READ_WRITE);
     if (notmuch == NULL)
        return 1;
 
+    notmuch_database_set_maildir_sync (notmuch,
+                                      notmuch_config_get_maildir_synchronize_flags (config));
     if (argc) {
        input = fopen (argv[0], "r");
        if (input == NULL) {
@@ -62,9 +65,11 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 
     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);
 
@@ -78,8 +83,8 @@ 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);
 
        message = notmuch_database_find_message (notmuch, message_id);
        if (message == NULL) {
@@ -88,11 +93,30 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
            goto NEXT_LINE;
        }
 
-       notmuch_message_freeze (message);
+       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);
+       }
+
+       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);
 
-       next = tags;
+       next = file_tags;
        while (next) {
            tag = strsep (&next, " ");
            if (*tag == '\0')
@@ -108,10 +132,13 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
        }
 
        notmuch_message_thaw (message);
-       notmuch_message_destroy (message);
+
       NEXT_LINE:
+       if (message)
+           notmuch_message_destroy (message);
+       message = NULL;
        free (message_id);
-       free (tags);
+       free (file_tags);
     }
 
     regfree (&regex);