emacs: Add new option notmuch-search-hide-excluded

[notmuch] / notmuch-setup.c

diff --git a/notmuch-setup.c b/notmuch-setup.c
index e9b81be839a0736a8b30cb24f88a55d1bbf95311..9382e2794a86dacdabcdee158c36f271a5dfd9ab 100644 (file)
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -74,7 +74,7 @@ welcome_message_post_setup (void)
 {
     printf ("\n"
            "Notmuch is now configured, and the configuration settings are saved in\n"
-           "a file in your home directory named .notmuch-config . If you'd like to\n"
+           "a file in your home directory named .notmuch-config. If you'd like to\n"
            "change the configuration in the future, you can either edit that file\n"
            "directly or run \"notmuch setup\".  To choose an alternate configuration\n"
            "location, set ${NOTMUCH_CONFIG}.\n\n"
@@ -124,14 +124,14 @@ parse_tag_list (void *ctx, char *response)
 }
 
 int
-notmuch_setup_command (notmuch_config_t *config,
-                      notmuch_database_t *notmuch,
+notmuch_setup_command (notmuch_database_t *notmuch,
                       int argc, char *argv[])
 {
     char *response = NULL;
     size_t response_size = 0;
     GPtrArray *other_emails;
     notmuch_config_values_t *new_tags, *search_exclude_tags, *emails;
+    notmuch_conffile_t *config;
 
 #define prompt(format, ...)                                     \
     do {                                                        \
@@ -147,21 +147,22 @@ notmuch_setup_command (notmuch_config_t *config,
     if (notmuch_minimal_options ("setup", argc, argv) < 0)
        return EXIT_FAILURE;
 
-    if (notmuch_requested_db_uuid)
-       fprintf (stderr, "Warning: ignoring --uuid=%s\n",
-                notmuch_requested_db_uuid);
+    config = notmuch_conffile_open (notmuch,
+                                   notmuch_config_path (notmuch), true);
+    if (! config)
+       return EXIT_FAILURE;
 
-    if (notmuch_config_is_new (config))
+    if (notmuch_conffile_is_new (config))
        welcome_message_pre_setup ();
 
     prompt ("Your full name [%s]: ", notmuch_config_get (notmuch, NOTMUCH_CONFIG_USER_NAME));
     if (strlen (response))
-       notmuch_config_set_user_name (config, response);
+       notmuch_conffile_set_user_name (config, response);
 
     prompt ("Your primary email address [%s]: ",
            notmuch_config_get (notmuch, NOTMUCH_CONFIG_PRIMARY_EMAIL));
     if (strlen (response))
-       notmuch_config_set_user_primary_email (config, response);
+       notmuch_conffile_set_user_primary_email (config, response);
 
     other_emails = g_ptr_array_new ();
 
@@ -183,10 +184,10 @@ notmuch_setup_command (notmuch_config_t *config,
            g_ptr_array_add (other_emails, talloc_strdup (config, response));
     } while (strlen (response));
     if (other_emails->len)
-       notmuch_config_set_user_other_email (config,
-                                            (const char **)
-                                            other_emails->pdata,
-                                            other_emails->len);
+       notmuch_conffile_set_user_other_email (config,
+                                              (const char **)
+                                              other_emails->pdata,
+                                              other_emails->len);
     g_ptr_array_free (other_emails, true);
 
     prompt ("Top-level directory of your email archive [%s]: ",
@@ -195,7 +196,7 @@ notmuch_setup_command (notmuch_config_t *config,
        const char *absolute_path;
 
        absolute_path = make_path_absolute (config, response);
-       notmuch_config_set_database_path (config, absolute_path);
+       notmuch_conffile_set_database_path (config, absolute_path);
     }
 
     new_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_NEW_TAGS);
@@ -207,8 +208,8 @@ notmuch_setup_command (notmuch_config_t *config,
     if (strlen (response)) {
        GPtrArray *tags = parse_tag_list (config, response);
 
-       notmuch_config_set_new_tags (config, (const char **) tags->pdata,
-                                    tags->len);
+       notmuch_conffile_set_new_tags (config, (const char **) tags->pdata,
+                                      tags->len);
 
        g_ptr_array_free (tags, true);
     }
@@ -222,17 +223,20 @@ notmuch_setup_command (notmuch_config_t *config,
     if (strlen (response)) {
        GPtrArray *tags = parse_tag_list (config, response);
 
-       notmuch_config_set_search_exclude_tags (config,
-                                               (const char **) tags->pdata,
-                                               tags->len);
+       notmuch_conffile_set_search_exclude_tags (config,
+                                                 (const char **) tags->pdata,
+                                                 tags->len);
 
        g_ptr_array_free (tags, true);
     }
 
-    if (notmuch_config_save (config))
+    if (notmuch_conffile_save (config))
        return EXIT_FAILURE;
 
-    if (notmuch_config_is_new (config))
+    if (config)
+       notmuch_conffile_close (config);
+
+    if (notmuch_conffile_is_new (config))
        welcome_message_post_setup ();
 
     return EXIT_SUCCESS;