X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-setup.c;h=cd1a52fffffbac46877c192f176ad91d6c93c0d6;hp=475248b1f9735b2e10f00f013deffa0baac85e7a;hb=HEAD;hpb=4ef2106792439f5ade157b3ba3b8f7fa86fcb3ed diff --git a/notmuch-setup.c b/notmuch-setup.c index 475248b1..9382e279 100644 --- a/notmuch-setup.c +++ b/notmuch-setup.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Carl Worth */ @@ -47,54 +47,58 @@ static void welcome_message_pre_setup (void) { printf ( -"Welcome to notmuch!\n\n" - -"The goal of notmuch is to help you manage and search your collection of\n" -"email, and to efficiently keep up with the flow of email as it comes in.\n\n" - -"Notmuch needs to know a few things about you such as your name and email\n" -"address, as well as the directory that contains your email. This is where\n" -"you already have mail stored and where messages will be delivered in the\n" -"future. This directory can contain any number of sub-directories. Regular\n" -"files in these directories should be individual email messages. If there\n" -"are other, non-email files (such as indexes maintained by other email\n" -"programs) then notmuch will do its best to detect those and ignore them.\n\n" - -"If you already have your email being delivered to directories in either\n" -"maildir or mh format, then that's perfect. Mail storage that uses mbox\n" -"format, (where one mbox file contains many messages), will not work with\n" -"notmuch. If that's how your mail is currently stored, we recommend you\n" -"first convert it to maildir format with a utility such as mb2md. You can\n" -"continue configuring notmuch now, but be sure to complete the conversion\n" -"before you run \"notmuch new\" for the first time.\n\n"); + "Welcome to notmuch!\n\n" + + "The goal of notmuch is to help you manage and search your collection of\n" + "email, and to efficiently keep up with the flow of email as it comes in.\n\n" + + "Notmuch needs to know a few things about you such as your name and email\n" + "address, as well as the directory that contains your email. This is where\n" + "you already have mail stored and where messages will be delivered in the\n" + "future. This directory can contain any number of sub-directories. Regular\n" + "files in these directories should be individual email messages. If there\n" + "are other, non-email files (such as indexes maintained by other email\n" + "programs) then notmuch will do its best to detect those and ignore them.\n\n" + + "If you already have your email being delivered to directories in either\n" + "maildir or mh format, then that's perfect. Mail storage that uses mbox\n" + "format, (where one mbox file contains many messages), will not work with\n" + "notmuch. If that's how your mail is currently stored, we recommend you\n" + "first convert it to maildir format with a utility such as mb2md. You can\n" + "continue configuring notmuch now, but be sure to complete the conversion\n" + "before you run \"notmuch new\" for the first time.\n\n"); } static void 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" -"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" - -"The next step is to run \"notmuch new\" which will create a database\n" -"that indexes all of your mail. Depending on the amount of mail you have\n" -"the initial indexing process can take a long time, so expect that.\n" -"Also, the resulting database will require roughly the same amount of\n" -"storage space as your current collection of email. So please ensure you\n" -"have sufficient storage space available now.\n\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" + "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" + + "The next step is to run \"notmuch new\" which will create a database\n" + "that indexes all of your mail. Depending on the amount of mail you have\n" + "the initial indexing process can take a long time, so expect that.\n" + "Also, the resulting database will require roughly the same amount of\n" + "storage space as your current collection of email. So please ensure you\n" + "have sufficient storage space available now.\n\n"); } static void -print_tag_list (const char **tags, size_t tags_len) +print_tag_list (notmuch_config_values_t *tags) { - unsigned int i; - for (i = 0; i < tags_len; i++) { - if (i != 0) + bool first = false; + + for (; + notmuch_config_values_valid (tags); + notmuch_config_values_move_to_next (tags)) { + if (! first) printf (" "); - printf ("%s", tags[i]); + first = false; + printf ("%s", notmuch_config_values_get (tags)); } } @@ -120,54 +124,58 @@ parse_tag_list (void *ctx, char *response) } int -notmuch_setup_command (notmuch_config_t *config, - unused (int argc), unused (char *argv[])) +notmuch_setup_command (notmuch_database_t *notmuch, + int argc, char *argv[]) { char *response = NULL; size_t response_size = 0; - const char **old_other_emails; - size_t old_other_emails_len; GPtrArray *other_emails; - unsigned int i; - const char **new_tags; - size_t new_tags_len; - const char **search_exclude_tags; - size_t search_exclude_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); \ + notmuch_config_values_t *new_tags, *search_exclude_tags, *emails; + notmuch_conffile_t *config; + +#define prompt(format, ...) \ + do { \ + printf (format, ##__VA_ARGS__); \ + fflush (stdout); \ + if (getline (&response, &response_size, stdin) < 0) { \ + printf ("Exiting.\n"); \ + exit (EXIT_FAILURE); \ + } \ + chomp_newline (response); \ } while (0) - if (notmuch_config_is_new (config)) + if (notmuch_minimal_options ("setup", argc, argv) < 0) + return EXIT_FAILURE; + + config = notmuch_conffile_open (notmuch, + notmuch_config_path (notmuch), true); + if (! config) + return EXIT_FAILURE; + + if (notmuch_conffile_is_new (config)) welcome_message_pre_setup (); - prompt ("Your full name [%s]: ", notmuch_config_get_user_name (config)); + 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_user_primary_email (config)); + 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 (); - old_other_emails = notmuch_config_get_user_other_email (config, - &old_other_emails_len); - for (i = 0; i < old_other_emails_len; i++) { - prompt ("Additional email address [%s]: ", old_other_emails[i]); + for (emails = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_OTHER_EMAIL); + notmuch_config_values_valid (emails); + notmuch_config_values_move_to_next (emails)) { + const char *email = notmuch_config_values_get (emails); + + prompt ("Additional email address [%s]: ", email); if (strlen (response)) g_ptr_array_add (other_emails, talloc_strdup (config, response)); else - g_ptr_array_add (other_emails, talloc_strdup (config, - old_other_emails[i])); + g_ptr_array_add (other_emails, talloc_strdup (config, email)); } do { @@ -176,59 +184,60 @@ 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); - g_ptr_array_free (other_emails, TRUE); + 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]: ", - notmuch_config_get_database_path (config)); + notmuch_config_get (notmuch, NOTMUCH_CONFIG_DATABASE_PATH)); if (strlen (response)) { 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_new_tags (config, &new_tags_len); + new_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_NEW_TAGS); printf ("Tags to apply to all new messages (separated by spaces) ["); - print_tag_list (new_tags, new_tags_len); + print_tag_list (new_tags); prompt ("]: "); 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); + g_ptr_array_free (tags, true); } - - search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len); + search_exclude_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_EXCLUDE_TAGS); printf ("Tags to exclude when searching messages (separated by spaces) ["); - print_tag_list (search_exclude_tags, search_exclude_tags_len); + print_tag_list (search_exclude_tags); prompt ("]: "); 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); + g_ptr_array_free (tags, true); } + if (notmuch_conffile_save (config)) + return EXIT_FAILURE; - if (! notmuch_config_save (config)) { - if (notmuch_config_is_new (config)) - welcome_message_post_setup (); - return 0; - } else { - return 1; - } + if (config) + notmuch_conffile_close (config); + + if (notmuch_conffile_is_new (config)) + welcome_message_post_setup (); + + return EXIT_SUCCESS; }