}
int
-notmuch_setup_command (unused (void *ctx),
+notmuch_setup_command (notmuch_config_t *config,
unused (int argc), unused (char *argv[]))
{
char *response = NULL;
size_t response_size = 0;
- notmuch_config_t *config;
const char **old_other_emails;
size_t old_other_emails_len;
GPtrArray *other_emails;
unsigned int i;
- int is_new;
const char **new_tags;
size_t new_tags_len;
+ const char **search_exclude_tags;
+ size_t search_exclude_tags_len;
#define prompt(format, ...) \
do { \
fflush (stdout); \
if (getline (&response, &response_size, stdin) < 0) { \
printf ("Exiting.\n"); \
- exit (1); \
+ exit (EXIT_FAILURE); \
} \
chomp_newline (response); \
} while (0)
- config = notmuch_config_open (ctx, NULL, &is_new);
-
- if (is_new)
+ if (notmuch_config_is_new (config))
welcome_message_pre_setup ();
prompt ("Your full name [%s]: ", notmuch_config_get_user_name (config));
for (i = 0; i < old_other_emails_len; i++) {
prompt ("Additional email address [%s]: ", old_other_emails[i]);
if (strlen (response))
- g_ptr_array_add (other_emails, talloc_strdup (ctx, response));
+ g_ptr_array_add (other_emails, talloc_strdup (config, response));
else
- g_ptr_array_add (other_emails, talloc_strdup (ctx,
+ g_ptr_array_add (other_emails, talloc_strdup (config,
old_other_emails[i]));
}
do {
prompt ("Additional email address [Press 'Enter' if none]: ");
if (strlen (response))
- g_ptr_array_add (other_emails, talloc_strdup (ctx, response));
+ g_ptr_array_add (other_emails, talloc_strdup (config, response));
} while (strlen (response));
if (other_emails->len)
notmuch_config_set_user_other_email (config,
if (strlen (response)) {
const char *absolute_path;
- absolute_path = make_path_absolute (ctx, response);
+ absolute_path = make_path_absolute (config, response);
notmuch_config_set_database_path (config, absolute_path);
}
prompt ("]: ");
if (strlen (response)) {
- GPtrArray *tags = parse_tag_list (ctx, response);
+ GPtrArray *tags = parse_tag_list (config, response);
notmuch_config_set_new_tags (config, (const char **) tags->pdata,
tags->len);
}
- /* Temporarily remove exclude tag support for 0.12 */
+ search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len);
+
+ printf ("Tags to exclude when searching messages (separated by spaces) [");
+ print_tag_list (search_exclude_tags, search_exclude_tags_len);
+ prompt ("]: ");
+
+ if (strlen (response)) {
+ GPtrArray *tags = parse_tag_list (config, response);
+
+ notmuch_config_set_search_exclude_tags (config,
+ (const char **) tags->pdata,
+ tags->len);
- if (! notmuch_config_save (config)) {
- if (is_new)
- welcome_message_post_setup ();
- return 0;
- } else {
- return 1;
+ g_ptr_array_free (tags, TRUE);
}
+
+ if (notmuch_config_save (config))
+ return EXIT_FAILURE;
+
+ if (notmuch_config_is_new (config))
+ welcome_message_post_setup ();
+
+ return EXIT_SUCCESS;
}