Rename NOTMUCH_DATABASE_MODE_WRITABLE to NOTMUCH_DATABASE_MODE_READ_WRITE

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index 8b3195984680fd948b1bae764ff1cf6068db9f83..bc35b4e8cf32480e1a7d1cf87cb95d7b6e4e3e71 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -193,6 +193,7 @@ add_files_recursive (notmuch_database_t *notmuch,
                                 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",
@@ -407,11 +408,13 @@ notmuch_new_command (void *ctx,
        if (interrupted)
            return 1;
 
+       printf ("Found %d total files.     \n", count);
        notmuch = notmuch_database_create (db_path);
        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_ONLY);
        add_files_state.ignore_read_only_directories = TRUE;
        add_files_state.total_files = 0;
     }
@@ -423,7 +426,6 @@ notmuch_new_command (void *ctx,
     dot_notmuch_path = NULL;
 
     add_files_state.saw_read_only_directory = FALSE;
-    add_files_state.total_files = 0;
     add_files_state.processed_files = 0;
     add_files_state.added_messages = 0;
     gettimeofday (&add_files_state.tv_start, NULL);