int
notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
{
- FILE *input = NULL;
- notmuch_database_t *notmuch = NULL;
+ notmuch_config_t *config;
+ notmuch_database_t *notmuch;
+ notmuch_bool_t synchronize_flags;
+ FILE *input;
char *line = NULL;
size_t line_size;
ssize_t line_len;
regex_t regex;
int rerr;
- int ret = 0;
+
+ config = notmuch_config_open (ctx, NULL, NULL);
+ if (config == NULL)
+ return 1;
+
+ notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+ NOTMUCH_DATABASE_MODE_READ_WRITE);
+ if (notmuch == NULL)
+ return 1;
+
+ synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
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;
+ return 1;
}
} 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
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);
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) {
+ fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n",
+ message_id);
+ goto NEXT_LINE;
+ }
- if (strlen (tags)) {
+ 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);
- 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;
- }
+ if (db_tags_str)
+ db_tags_str = talloc_asprintf_append (db_tags_str, " %s", tag);
+ else
+ db_tags_str = talloc_strdup (message, tag);
+ }
- notmuch_message_freeze (message);
-
- notmuch_message_remove_all_tags (message);
-
- 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);
- fprintf (stderr, "%s\n",
- notmuch_status_to_string (status));
- }
- }
+ 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_thaw (message);
- notmuch_message_destroy (message);
+ notmuch_message_freeze (message);
+ notmuch_message_remove_all_tags (message);
+
+ next = file_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);
+ fprintf (stderr, "%s\n",
+ notmuch_status_to_string (status));
+ }
}
+
+ notmuch_message_thaw (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 (®ex);
- DONE:
if (line)
free (line);
- if (notmuch)
- notmuch_database_close (notmuch);
- if (input && input != stdin)
+
+ notmuch_database_close (notmuch);
+ if (input != stdin)
fclose (input);
- return ret;
+ return 0;
}