Make maildir synchronization configurable

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index 484d94623fa13fb1b456a185e1f1eecc5133bfea..273916e6d1611eb89f49c30119c8d25bf76d6ab5 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -35,6 +35,8 @@ typedef struct _filename_list {
 typedef struct {
     int output_is_a_tty;
     int verbose;
+    const char **new_tags;
+    size_t new_tags_length;
 
     int total_files;
     int processed_files;
@@ -43,6 +45,7 @@ typedef struct {
 
     _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;
@@ -93,13 +96,6 @@ _filename_list_add (_filename_list_t *list,
     list->tail = &node->next;
 }
 
-static void
-tag_inbox_and_unread (notmuch_message_t *message)
-{
-    notmuch_message_add_tag (message, "inbox");
-    notmuch_message_add_tag (message, "unread");
-}
-
 static void
 add_files_print_progress (add_files_state_t *state)
 {
@@ -222,6 +218,7 @@ add_files_recursive (notmuch_database_t *notmuch,
     notmuch_filenames_t *db_subdirs = NULL;
     struct stat st;
     notmuch_bool_t is_maildir, new_directory;
+    const char **tag;
 
     if (stat (path, &st)) {
        fprintf (stderr, "Error reading directory %s: %s\n",
@@ -412,11 +409,15 @@ add_files_recursive (notmuch_database_t *notmuch,
        /* success */
        case NOTMUCH_STATUS_SUCCESS:
            state->added_messages++;
-           tag_inbox_and_unread (message);
+           for (tag=state->new_tags; *tag != NULL; tag++)
+               notmuch_message_add_tag (message, *tag);
+           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:
-           /* Stay silent on this one. */
+           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",
@@ -739,6 +740,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     if (config == NULL)
        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");