---
notmuch-setup.c | 55 +++++++++++++++++++++++--------------------------
notmuch.c | 19 ++++++++++-------
2 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/notmuch-setup.c b/notmuch-setup.c
index 67214470..1e22412b 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -88,14 +88,17 @@ welcome_message_post_setup (void)
}
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)
- printf (" ");
- printf ("%s", tags[i]);
+ bool first = false;
+
+ for (;
+ notmuch_config_values_valid(tags);
+ notmuch_config_values_move_to_next (tags)) {
+ if (!first)
+ printf(" ");
+ first = false;
+ printf("%s", notmuch_config_values_get (tags));
}
}
@@ -122,19 +125,13 @@ parse_tag_list (void *ctx, char *response)
int
notmuch_setup_command (notmuch_config_t *config,
- unused(notmuch_database_t *notmuch),
+ 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;
+ notmuch_config_values_t *new_tags, *search_exclude_tags, *emails;
#define prompt(format, ...) \
do { \
@@ -157,26 +154,27 @@ notmuch_setup_command (notmuch_config_t *config,
if (notmuch_config_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);
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);
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 {
@@ -192,7 +190,7 @@ notmuch_setup_command (notmuch_config_t *config,
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;
@@ -200,10 +198,10 @@ notmuch_setup_command (notmuch_config_t *config,
notmuch_config_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)) {
@@ -215,11 +213,10 @@ notmuch_setup_command (notmuch_config_t *config,
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)) {
diff --git a/notmuch.c b/notmuch.c
index 90504d37..7beeb177 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -139,9 +139,11 @@ notmuch_process_shared_indexing_options
(notmuch_database_t *notmuch)
static command_t commands[] = {
- { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_OPEN |
NOTMUCH_COMMAND_CONFIG_CREATE,
+ { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_OPEN |
NOTMUCH_COMMAND_CONFIG_CREATE
+ | NOTMUCH_COMMAND_CONFIG_LOAD,
"Notmuch main command." },
- { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_OPEN |
NOTMUCH_COMMAND_CONFIG_CREATE,
+ { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_OPEN |
NOTMUCH_COMMAND_CONFIG_CREATE
+ | NOTMUCH_COMMAND_CONFIG_LOAD,
"Interactively set up notmuch for first use." },
{ "new", notmuch_new_command,
NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE |
NOTMUCH_COMMAND_DATABASE_CREATE,
@@ -374,7 +376,7 @@ notmuch_command (notmuch_config_t *config,
* notmuch_setup_command which will give a nice welcome message,
* and interactively guide the user through the configuration. */
if (notmuch_config_is_new (config))
- return notmuch_setup_command (config, NULL, 0, NULL);
+ return notmuch_setup_command (config, notmuch, 0, NULL);
/* Notmuch is already configured, but is there a database? */
db_path = talloc_asprintf (config, "%s/%s",
@@ -558,14 +560,17 @@ main (int argc, char *argv[])
NULL,
¬much,
&status_string);
- if (status) {
+
+ if (status == NOTMUCH_STATUS_NO_CONFIG && !(command->mode &
NOTMUCH_COMMAND_CONFIG_CREATE)) {
+ fputs ("Try running 'notmuch setup' to create a configuration.",
stderr);
+ goto DONE;
+ }
+
+ if (status && (status != NOTMUCH_STATUS_NO_CONFIG)) {
if (status_string) {
fputs (status_string, stderr);
free (status_string);
}
-
- if (status == NOTMUCH_STATUS_NO_CONFIG)
- fputs ("Try running 'notmuch setup' to create a
configuration.", stderr);
goto DONE;
}
--
2.30.0
_______________________________________________
notmuch mailing list -- [email protected]
To unsubscribe send an email to [email protected]
