X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-setup.c;h=9f37e4a6dc411cfe2efba64687b499580bd445f8;hp=d06fbf80e6aac2e41e80f13abcbf7606f92a9440;hb=4cfb2a02778bac16e785bbea1fd6c665e34bd955;hpb=91d1d3f043b82d5f3f8c04f2db71a829a7406131

diff --git a/notmuch-setup.c b/notmuch-setup.c
index d06fbf80..9f37e4a6 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -92,20 +92,25 @@ notmuch_setup_command (unused (void *ctx),
 		       unused (int argc), unused (char *argv[]))
 {
     char *response = NULL;
-    size_t response_size;
+    size_t response_size = 0;
     notmuch_config_t *config;
-    char **old_other_emails;
+    const char **old_other_emails;
     size_t old_other_emails_len;
     GPtrArray *other_emails;
     unsigned int i;
     int is_new;
-
-#define prompt(format, ...)				\
-    do {						\
-	printf (format, ##__VA_ARGS__);			\
-	fflush (stdout);				\
-	getline (&response, &response_size, stdin);	\
-	chomp_newline (response);			\
+    const char **new_tags;
+    size_t new_tags_len;
+
+#define prompt(format, ...)					\
+    do {							\
+	printf (format, ##__VA_ARGS__);				\
+	fflush (stdout);					\
+	if (getline (&response, &response_size, stdin) < 0) {	\
+	    printf ("Exiting.\n");				\
+	    exit (1);						\
+	}							\
+	chomp_newline (response);				\
     } while (0)
 
     config = notmuch_config_open (ctx, NULL, &is_new);
@@ -156,10 +161,55 @@ notmuch_setup_command (unused (void *ctx),
 	notmuch_config_set_database_path (config, absolute_path);
     }
 
-    notmuch_config_save (config);
+    new_tags = notmuch_config_get_new_tags (config, &new_tags_len);
 
-    if (is_new)
-	welcome_message_post_setup ();
+    printf ("Tags to apply to all new messages (separated by spaces) [");
+
+    for (i = 0; i < new_tags_len; i++) {
+	if (i != 0)
+	    printf (" ");
+	printf ("%s", new_tags[i]);
+    }
+
+    prompt ("]: ");
+
+    if (strlen (response)) {
+	GPtrArray *tags = g_ptr_array_new ();
+	char *tag = response;
+	char *space;
+
+	while (tag && *tag) {
+	    space = strchr (tag, ' ');
+	    if (space)
+		g_ptr_array_add (tags, talloc_strndup (ctx, tag, space - tag));
+	    else
+		g_ptr_array_add (tags, talloc_strdup (ctx, tag));
+	    tag = space;
+	    while (tag && *tag == ' ')
+		tag++;
+	}
+
+	notmuch_config_set_new_tags (config, (const char **) tags->pdata,
+				     tags->len);
+
+	g_ptr_array_free (tags, TRUE);
+    }
+
+    prompt ("Synchronize maildir flags with notmuch tags? %s: ",
+	    notmuch_config_get_maildir_synchronize_flags (config) == TRUE ? "[yes]/no" : "[no]/yes");
+    if (strlen (response) > 0) {
+	if (strcasecmp (response, "yes") == 0||
+	    strcasecmp (response, "y") == 0)
+	    notmuch_config_set_maildir_synchronize_flags (config, TRUE);
+	else
+	    notmuch_config_set_maildir_synchronize_flags (config, FALSE);
+    }
 
-    return 0;
+    if (! notmuch_config_save (config)) {
+	if (is_new)
+	  welcome_message_post_setup ();
+	return 0;
+    } else {
+	return 1;
+    }
 }