X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-setup.c;h=9382e2794a86dacdabcdee158c36f271a5dfd9ab;hp=2c3404ff67b6c0d36c511b997185400713d8dd09;hb=HEAD;hpb=6bd01e1b340f6a209dde64471bc9d7137511dada

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 2c3404ff..9382e279 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -13,138 +13,13 @@
  * 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 <cworth@cworth.org>
  */
 
 #include "notmuch-client.h"
 
-static notmuch_status_t
-add_all_files (notmuch_database_t *notmuch,
-	       const char *mail_directory,
-	       int num_files)
-{
-    add_files_state_t add_files_state;
-    double elapsed;
-    struct timeval tv_now;
-    notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-
-    add_files_state.ignore_read_only_directories = FALSE;
-    add_files_state.saw_read_only_directory = FALSE;
-    add_files_state.total_files = num_files;
-    add_files_state.processed_files = 0;
-    add_files_state.added_messages = 0;
-    add_files_state.callback = NULL;
-    gettimeofday (&add_files_state.tv_start, NULL);
-
-    ret = add_files (notmuch, mail_directory, &add_files_state);
-
-    gettimeofday (&tv_now, NULL);
-    elapsed = notmuch_time_elapsed (add_files_state.tv_start,
-				    tv_now);
-    printf ("Processed %d %s in ", add_files_state.processed_files,
-	    add_files_state.processed_files == 1 ?
-	    "file" : "total files");
-    notmuch_time_print_formatted_seconds (elapsed);
-    if (elapsed > 1) {
-	printf (" (%d files/sec.).                 \n",
-		(int) (add_files_state.processed_files / elapsed));
-    } else {
-	printf (".                    \n");
-    }
-    if (add_files_state.added_messages) {
-	printf ("Added %d %s to the database.\n\n",
-		add_files_state.added_messages,
-		add_files_state.added_messages == 1 ?
-		"message" : "unique messages");
-    }
-
-    return ret;
-}
-
-
-/* XXX: This should be merged with the existing add_files function in
- * add-files.c. */
-/* Recursively count all regular files in path and all sub-direcotries
- * of path.  The result is added to *count (which should be
- * initialized to zero by the top-level caller before calling
- * count_files). */
-static void
-count_files (const char *path, int *count)
-{
-    DIR *dir;
-    struct dirent *e, *entry = NULL;
-    int entry_length;
-    int err;
-    char *next;
-    struct stat st;
-
-    dir = opendir (path);
-
-    if (dir == NULL) {
-	fprintf (stderr, "Warning: failed to open directory %s: %s\n",
-		 path, strerror (errno));
-	goto DONE;
-    }
-
-    entry_length = offsetof (struct dirent, d_name) +
-	pathconf (path, _PC_NAME_MAX) + 1;
-    entry = malloc (entry_length);
-
-    while (1) {
-	err = readdir_r (dir, entry, &e);
-	if (err) {
-	    fprintf (stderr, "Error reading directory: %s\n",
-		     strerror (errno));
-	    free (entry);
-	    goto DONE;
-	}
-
-	if (e == NULL)
-	    break;
-
-	/* Ignore special directories to avoid infinite recursion.
-	 * Also ignore the .notmuch directory.
-	 */
-	/* XXX: Eventually we'll want more sophistication to let the
-	 * user specify files to be ignored. */
-	if (strcmp (entry->d_name, ".") == 0 ||
-	    strcmp (entry->d_name, "..") == 0 ||
-	    strcmp (entry->d_name, ".notmuch") == 0)
-	{
-	    continue;
-	}
-
-	if (asprintf (&next, "%s/%s", path, entry->d_name) == -1) {
-	    next = NULL;
-	    fprintf (stderr, "Error descending from %s to %s: Out of memory\n",
-		     path, entry->d_name);
-	    continue;
-	}
-
-	stat (next, &st);
-
-	if (S_ISREG (st.st_mode)) {
-	    *count = *count + 1;
-	    if (*count % 1000 == 0) {
-		printf ("Found %d files so far.\r", *count);
-		fflush (stdout);
-	    }
-	} else if (S_ISDIR (st.st_mode)) {
-	    count_files (next, count);
-	}
-
-	free (next);
-    }
-
-  DONE:
-    if (entry)
-	free (entry);
-
-    closedir (dir);
-}
-
 static const char *
 make_path_absolute (void *ctx, const char *path)
 {
@@ -172,118 +47,197 @@ 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\".\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 (notmuch_config_values_t *tags)
+{
+    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));
+    }
+}
+
+static GPtrArray *
+parse_tag_list (void *ctx, char *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++;
+    }
+
+    return tags;
 }
 
 int
-notmuch_setup_command (unused (void *ctx),
-		       unused (int argc), unused (char *argv[]))
+notmuch_setup_command (notmuch_database_t *notmuch,
+		       int argc, char *argv[])
 {
     char *response = NULL;
-    size_t response_size;
-    notmuch_config_t *config;
-    char **old_other_emails;
-    size_t old_other_emails_len;
+    size_t response_size = 0;
     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);			\
+    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)
 
-    config = notmuch_config_open (ctx, NULL, &is_new);
+    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 (is_new)
+    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 (ctx, response));
+	    g_ptr_array_add (other_emails, talloc_strdup (config, response));
 	else
-	    g_ptr_array_add (other_emails, talloc_strdup (ctx,
-							 old_other_emails[i]));
+	    g_ptr_array_add (other_emails, talloc_strdup (config, email));
     }
 
     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,
-					     (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 (ctx, response);
-	notmuch_config_set_database_path (config, absolute_path);
+	absolute_path = make_path_absolute (config, response);
+	notmuch_conffile_set_database_path (config, absolute_path);
+    }
+
+    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);
+    prompt ("]: ");
+
+    if (strlen (response)) {
+	GPtrArray *tags = parse_tag_list (config, response);
+
+	notmuch_conffile_set_new_tags (config, (const char **) tags->pdata,
+				       tags->len);
+
+	g_ptr_array_free (tags, true);
     }
 
-    notmuch_config_save (config);
+    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);
+    prompt ("]: ");
+
+    if (strlen (response)) {
+	GPtrArray *tags = parse_tag_list (config, response);
+
+	notmuch_conffile_set_search_exclude_tags (config,
+						  (const char **) tags->pdata,
+						  tags->len);
+
+	g_ptr_array_free (tags, true);
+    }
+
+    if (notmuch_conffile_save (config))
+	return EXIT_FAILURE;
+
+    if (config)
+	notmuch_conffile_close (config);
 
-    if (is_new)
+    if (notmuch_conffile_is_new (config))
 	welcome_message_post_setup ();
 
-    return 0;
+    return EXIT_SUCCESS;
 }