notmuch new: Automatically upgrade the database if necessary.

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index 7d15fe9184183401ab96556ff9f6d7c6168be8c9..0d06253d9fb5221949ce6da83ac3d97d58ee4f0e 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -221,7 +221,7 @@ add_files_recursive (notmuch_database_t *notmuch,
     notmuch_filenames_t *db_files = NULL;
     notmuch_filenames_t *db_subdirs = NULL;
     struct stat st;
-    notmuch_bool_t is_maildir;
+    notmuch_bool_t is_maildir, new_directory;
 
     if (stat (path, &st)) {
        fprintf (stderr, "Error reading directory %s: %s\n",
@@ -239,15 +239,23 @@ add_files_recursive (notmuch_database_t *notmuch,
 
     directory = notmuch_database_get_directory (notmuch, path);
     db_mtime = notmuch_directory_get_mtime (directory);
-    db_files = notmuch_directory_get_child_files (directory);
-    db_subdirs = notmuch_directory_get_child_directories (directory);
+
+    if (db_mtime == 0) {
+       new_directory = TRUE;
+       db_files = NULL;
+       db_subdirs = NULL;
+    } else {
+       new_directory = FALSE;
+       db_files = notmuch_directory_get_child_files (directory);
+       db_subdirs = notmuch_directory_get_child_directories (directory);
+    }
 
     /* If the database knows about this directory, then we sort based
      * on strcmp to match the database sorting. Otherwise, we can do
      * inode-based sorting for faster filesystem operation. */
     num_fs_entries = scandir (path, &fs_entries, 0,
-                             db_mtime ?
-                             dirent_sort_strcmp_name : dirent_sort_inode);
+                             new_directory ?
+                             dirent_sort_inode : dirent_sort_strcmp_name);
 
     if (num_fs_entries == -1) {
        fprintf (stderr, "Error opening directory %s: %s\n",
@@ -398,7 +406,7 @@ add_files_recursive (notmuch_database_t *notmuch,
                     next);
            break;
        /* Fatal issues. Don't process anymore. */
-       case NOTMUCH_STATUS_READONLY_DATABASE:
+       case NOTMUCH_STATUS_READ_ONLY_DATABASE:
        case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
        case NOTMUCH_STATUS_OUT_OF_MEMORY:
            fprintf (stderr, "Error: %s. Halting processing.\n",
@@ -608,6 +616,71 @@ count_files (const char *path, int *count)
         free (fs_entries);
 }
 
+static void
+upgrade_print_progress (void *closure,
+                       unsigned int count,
+                       unsigned int total)
+{
+    add_files_state_t *state = closure;
+    struct timeval tv_now;
+    double elapsed_overall, rate_overall, time_remaining;
+
+    gettimeofday (&tv_now, NULL);
+
+    elapsed_overall = notmuch_time_elapsed (state->tv_start, tv_now);
+    rate_overall = count / elapsed_overall;
+    time_remaining = ((total - count) / rate_overall);
+
+    printf ("Upgraded %d of %d messages (", count, total);
+    notmuch_time_print_formatted_seconds (time_remaining);
+    printf (" remaining).      \r");
+
+    fflush (stdout);
+}
+
+/* Recursively remove all filenames from the database referring to
+ * 'path' (or to any of its children). */
+static void
+_remove_directory (void *ctx,
+                  notmuch_database_t *notmuch,
+                  const char *path,
+                  int *renamed_files,
+                  int *removed_files)
+{
+    notmuch_directory_t *directory;
+    notmuch_filenames_t *files, *subdirs;
+    notmuch_status_t status;
+    char *absolute;
+
+    directory = notmuch_database_get_directory (notmuch, path);
+
+    for (files = notmuch_directory_get_child_files (directory);
+        notmuch_filenames_has_more (files);
+        notmuch_filenames_advance (files))
+    {
+       absolute = talloc_asprintf (ctx, "%s/%s", path,
+                                   notmuch_filenames_get (files));
+       status = notmuch_database_remove_message (notmuch, absolute);
+       if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
+           *renamed_files = *renamed_files + 1;
+       else
+           *removed_files = *removed_files + 1;
+       talloc_free (absolute);
+    }
+
+    for (subdirs = notmuch_directory_get_child_directories (directory);
+        notmuch_filenames_has_more (subdirs);
+        notmuch_filenames_advance (subdirs))
+    {
+       absolute = talloc_asprintf (ctx, "%s/%s", path,
+                                   notmuch_filenames_get (subdirs));
+       _remove_directory (ctx, notmuch, absolute, renamed_files, removed_files);
+       talloc_free (absolute);
+    }
+
+    notmuch_directory_destroy (directory);
+}
+
 int
 notmuch_new_command (void *ctx, int argc, char *argv[])
 {
@@ -667,6 +740,18 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     } else {
        notmuch = notmuch_database_open (db_path,
                                         NOTMUCH_DATABASE_MODE_READ_WRITE);
+       if (notmuch == NULL)
+           return 1;
+
+       if (notmuch_database_needs_upgrade (notmuch)) {
+           printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n");
+           gettimeofday (&add_files_state.tv_start, NULL);
+           notmuch_database_upgrade (notmuch, upgrade_print_progress,
+                                     &add_files_state);
+           printf ("Your notmuch database has now been upgraded to database format version %u.\n",
+                   notmuch_database_get_version (notmuch));
+       }
+
        add_files_state.total_files = 0;
     }
 
@@ -696,28 +781,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     }
 
     for (f = add_files_state.removed_directories->head; f; f = f->next) {
-       notmuch_directory_t *directory;
-       notmuch_filenames_t *files;
-
-       directory = notmuch_database_get_directory (notmuch, f->filename);
-
-       for (files = notmuch_directory_get_child_files (directory);
-            notmuch_filenames_has_more (files);
-            notmuch_filenames_advance (files))
-       {
-           char *absolute;
-
-           absolute = talloc_asprintf (ctx, "%s/%s", f->filename,
-                                       notmuch_filenames_get (files));
-           status = notmuch_database_remove_message (notmuch, absolute);
-           if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
-               renamed_files++;
-           else
-               removed_files++;
-           talloc_free (absolute);
-       }
-
-       notmuch_directory_destroy (directory);
+       _remove_directory (ctx, notmuch, f->filename,
+                          &renamed_files, &removed_files);
     }
 
     talloc_free (add_files_state.removed_files);