Make maildir synchronization configurable

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index ed3f944f0c9468cde72d2708bf704f7c1a1e057c..273916e6d1611eb89f49c30119c8d25bf76d6ab5 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -45,6 +45,7 @@ typedef struct {
 
     _filename_list_t *removed_files;
     _filename_list_t *removed_directories;
 
     _filename_list_t *removed_files;
     _filename_list_t *removed_directories;

+    notmuch_bool_t maildir_sync;

 } add_files_state_t;
 
 static volatile sig_atomic_t do_add_files_print_progress = 0;
 } add_files_state_t;
 
 static volatile sig_atomic_t do_add_files_print_progress = 0;


@@ -410,11 +411,13 @@ add_files_recursive (notmuch_database_t *notmuch,
            state->added_messages++;
            for (tag=state->new_tags; *tag != NULL; tag++)
                notmuch_message_add_tag (message, *tag);
            state->added_messages++;
            for (tag=state->new_tags; *tag != NULL; tag++)
                notmuch_message_add_tag (message, *tag);

-           notmuch_message_maildir_to_tags (message, next);
+           if (state->maildir_sync == TRUE)
+               notmuch_message_maildir_to_tags (message, next);

            break;
        /* Non-fatal issues (go on to next file) */
        case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
            break;
        /* Non-fatal issues (go on to next file) */
        case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:

-           notmuch_message_maildir_to_tags (message, next);
+           if (state->maildir_sync == TRUE)
+               notmuch_message_maildir_to_tags (message, next);

            break;
        case NOTMUCH_STATUS_FILE_NOT_EMAIL:
            fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
            break;
        case NOTMUCH_STATUS_FILE_NOT_EMAIL:
            fprintf (stderr, "Note: Ignoring non-mail file: %s\n",


@@ -738,6 +741,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
        return 1;
 
     add_files_state.new_tags = notmuch_config_get_new_tags (config, &add_files_state.new_tags_length);
        return 1;
 
     add_files_state.new_tags = notmuch_config_get_new_tags (config, &add_files_state.new_tags_length);

+    add_files_state.maildir_sync = notmuch_config_get_maildir_sync (config);

     db_path = notmuch_config_get_database_path (config);
 
     dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");
     db_path = notmuch_config_get_database_path (config);
 
     dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");