static notmuch_status_t
add_files_recursive (notmuch_database_t *notmuch,
const char *path,
- const char *tag,
struct stat *st,
add_files_state_t *state)
{
case NOTMUCH_STATUS_SUCCESS:
state->added_messages++;
tag_inbox_and_unread (message);
- notmuch_message_add_tag (message, tag);
break;
/* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
next);
break;
/* Fatal issues. Don't process anymore. */
+ case NOTMUCH_STATUS_READONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY:
fprintf (stderr, "Error: %s. Halting processing.\n",
}
}
} else if (S_ISDIR (st->st_mode)) {
- if ((strcmp (entry->d_name, "cur") == 0) ||
- (strcmp (entry->d_name, "new") == 0) ||
- (strcmp (entry->d_name, "tmp") == 0)) {
- status = add_files_recursive (notmuch, next, tag, st, state);
- } else {
- status = add_files_recursive (notmuch, next, entry->d_name, st, state);
- }
+ status = add_files_recursive (notmuch, next, st, state);
if (status && ret == NOTMUCH_STATUS_SUCCESS)
ret = status;
}
timerval.it_value.tv_usec = 0;
setitimer (ITIMER_REAL, &timerval, NULL);
- status = add_files_recursive (notmuch, path, basename(path), &st, state);
+ status = add_files_recursive (notmuch, path, &st, state);
/* Now stop the timer. */
timerval.it_interval.tv_sec = 0;
add_files_state.ignore_read_only_directories = FALSE;
add_files_state.total_files = count;
} else {
- notmuch = notmuch_database_open (db_path);
+ notmuch = notmuch_database_open (db_path,
+ NOTMUCH_DATABASE_MODE_READ_WRITE);
add_files_state.ignore_read_only_directories = TRUE;
add_files_state.total_files = 0;
}