X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=d4e0745369b57b82069260c8ffd2a45b088a476b;hp=e1409209e43694aca6f5896deb1f7484d9d3d2ac;hb=cbb2675ec5b52c76cd17b2cb3feb87d88aa134a7;hpb=302d54834d090d7e62377883f36dc709c95e5673 diff --git a/notmuch.c b/notmuch.c index e1409209..d4e07453 100644 --- a/notmuch.c +++ b/notmuch.c @@ -18,11 +18,12 @@ * Author: Carl Worth */ -#include "notmuch.h" - #ifndef _GNU_SOURCE #define _GNU_SOURCE /* for getline */ #endif +#include + +#include "notmuch.h" /* This is separate from notmuch-private.h because we're trying to * keep notmuch.c from looking into any internals, (which helps us @@ -30,7 +31,6 @@ */ #include "xutil.h" -#include #include #include #include @@ -54,8 +54,9 @@ typedef struct command { } command_t; typedef struct { - int total_messages; - int count; + int total_files; + int processed_files; + int added_messages; struct timeval tv_start; } add_files_state_t; @@ -80,6 +81,11 @@ print_formatted_seconds (double seconds) int hours; int minutes; + if (seconds < 1) { + printf ("almost no time"); + return; + } + if (seconds > 3600) { hours = (int) seconds / 3600; printf ("%dh ", hours); @@ -92,7 +98,7 @@ print_formatted_seconds (double seconds) seconds -= minutes * 60; } - printf ("%02ds", (int) seconds); + printf ("%ds", (int) seconds); } void @@ -104,37 +110,73 @@ add_files_print_progress (add_files_state_t *state) gettimeofday (&tv_now, NULL); elapsed_overall = tv_elapsed (state->tv_start, tv_now); - rate_overall = (state->count) / elapsed_overall; + rate_overall = (state->processed_files) / elapsed_overall; - printf ("Added %d of %d messages (", - state->count, state->total_messages); - print_formatted_seconds ((state->total_messages - state->count) / - rate_overall); - printf (" remaining). \r"); + printf ("Processed %d", state->processed_files); + + if (state->total_files) { + printf (" of %d files (", state->total_files); + print_formatted_seconds ((state->total_files - state->processed_files) / + rate_overall); + printf (" remaining). \r"); + } else { + printf (" files (%d files/sec.) \r", (int) rate_overall); + } fflush (stdout); } -/* Recursively find all regular files in 'path' and add them to the - * database. */ -void +/* Examine 'path' recursively as follows: + * + * o Ask the filesystem for the mtime of 'path' (path_mtime) + * + * o Ask the database for its timestamp of 'path' (path_dbtime) + * + * o If 'path_mtime' > 'path_dbtime' + * + * o For each regular file in 'path' with mtime newer than the + * 'path_dbtime' call add_message to add the file to the + * database. + * + * o For each sub-directory of path, recursively call into this + * same function. + * + * o Tell the database to update its time of 'path' to 'path_mtime' + */ +notmuch_status_t add_files (notmuch_database_t *notmuch, const char *path, add_files_state_t *state) { - DIR *dir; - struct dirent *entry, *e; + DIR *dir = NULL; + struct dirent *e, *entry = NULL; int entry_length; int err; - char *next; + char *next = NULL; struct stat st; - notmuch_status_t status; + time_t path_mtime, path_dbtime; + notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; - dir = opendir (path); + if (stat (path, &st)) { + fprintf (stderr, "Error reading directory %s: %s\n", + path, strerror (errno)); + return NOTMUCH_STATUS_FILE_ERROR; + } + if (! S_ISDIR (st.st_mode)) { + fprintf (stderr, "Error: %s is not a directory.\n", path); + return NOTMUCH_STATUS_FILE_ERROR; + } + + path_mtime = st.st_mtime; + + path_dbtime = notmuch_database_get_timestamp (notmuch, path); + + dir = opendir (path); if (dir == NULL) { - fprintf (stderr, "Warning: failed to open directory %s: %s\n", + fprintf (stderr, "Error opening directory %s: %s\n", path, strerror (errno)); - return; + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } entry_length = offsetof (struct dirent, d_name) + @@ -146,13 +188,19 @@ add_files (notmuch_database_t *notmuch, const char *path, if (err) { fprintf (stderr, "Error reading directory: %s\n", strerror (errno)); - free (entry); - return; + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } if (e == NULL) break; + /* If this directory hasn't been modified since the last + * add_files, then we only need to look further for + * sub-directories. */ + if (path_mtime <= path_dbtime && entry->d_type != DT_DIR) + continue; + /* Ignore special directories to avoid infinite recursion. * Also ignore the .notmuch directory. */ @@ -167,28 +215,67 @@ add_files (notmuch_database_t *notmuch, const char *path, next = g_strdup_printf ("%s/%s", path, entry->d_name); - stat (next, &st); + if (stat (next, &st)) { + fprintf (stderr, "Error reading %s: %s\n", + next, strerror (errno)); + ret = NOTMUCH_STATUS_FILE_ERROR; + continue; + } if (S_ISREG (st.st_mode)) { - status = notmuch_database_add_message (notmuch, next); - if (status == NOTMUCH_STATUS_FILE_NOT_EMAIL) { - fprintf (stderr, "Note: Ignoring non-mail file: %s\n", - next); - } else { - state->count++; + /* If the file hasn't been modified since the last + * add_files, then we need not look at it. */ + if (st.st_mtime > path_dbtime) { + state->processed_files++; + + status = notmuch_database_add_message (notmuch, next); + switch (status) { + /* success */ + case NOTMUCH_STATUS_SUCCESS: + state->added_messages++; + break; + /* Non-fatal issues (go on to next file) */ + case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: + /* Stay silent on this one. */ + break; + case NOTMUCH_STATUS_FILE_NOT_EMAIL: + fprintf (stderr, "Note: Ignoring non-mail file: %s\n", + next); + break; + /* Fatal issues. Don't process anymore. */ + case NOTMUCH_STATUS_XAPIAN_EXCEPTION: + fprintf (stderr, "A Xapian error was encountered. Halting processing.\n"); + ret = status; + goto DONE; + default: + fprintf (stderr, "Internal error: add_message returned unexpected value: %d\n", status); + ret = status; + goto DONE; + } + if (state->processed_files % 1000 == 0) + add_files_print_progress (state); } - if (state->count % 1000 == 0) - add_files_print_progress (state); } else if (S_ISDIR (st.st_mode)) { - add_files (notmuch, next, state); + status = add_files (notmuch, next, state); + if (status && ret == NOTMUCH_STATUS_SUCCESS) + ret = status; } free (next); + next = NULL; } - free (entry); + notmuch_database_set_timestamp (notmuch, path, path_mtime); - closedir (dir); + DONE: + if (next) + free (next); + if (entry) + free (entry); + if (dir) + closedir (dir); + + return ret; } /* Recursively count all regular files in path and all sub-direcotries @@ -266,13 +353,14 @@ count_files (const char *path, int *count) int setup_command (int argc, char *argv[]) { - notmuch_database_t *notmuch; - char *mail_directory, *default_path; + notmuch_database_t *notmuch = NULL; + char *default_path, *mail_directory = NULL; size_t line_size; int count; add_files_state_t add_files_state; double elapsed; struct timeval tv_now; + notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; printf ("Welcome to notmuch!\n\n"); @@ -298,7 +386,6 @@ setup_command (int argc, char *argv[]) printf ("Top-level mail directory [%s]: ", default_path); fflush (stdout); - mail_directory = NULL; getline (&mail_directory, &line_size, stdin); chomp_newline (mail_directory); @@ -328,8 +415,8 @@ setup_command (int argc, char *argv[]) if (notmuch == NULL) { fprintf (stderr, "Failed to create new notmuch database at %s\n", mail_directory); - free (mail_directory); - return 1; + ret = NOTMUCH_STATUS_FILE_ERROR; + goto DONE; } printf ("OK. Let's take a look at the mail we can find in the directory\n"); @@ -342,24 +429,100 @@ setup_command (int argc, char *argv[]) printf ("Next, we'll inspect the messages and create a database of threads:\n"); - add_files_state.total_messages = count; - add_files_state.count = 0; + add_files_state.total_files = count; + add_files_state.processed_files = 0; + add_files_state.added_messages = 0; gettimeofday (&add_files_state.tv_start, NULL); - add_files (notmuch, mail_directory, &add_files_state); + ret = add_files (notmuch, mail_directory, &add_files_state); gettimeofday (&tv_now, NULL); elapsed = tv_elapsed (add_files_state.tv_start, tv_now); - printf ("Added %d total messages in ", add_files_state.count); + printf ("Processed %d total files in ", add_files_state.processed_files); print_formatted_seconds (elapsed); - printf (" (%d messages/sec.). \n", (int) (add_files_state.count / elapsed)); + if (elapsed > 1) { + printf (" (%d files/sec.). \n", + (int) (add_files_state.processed_files / elapsed)); + } else { + printf (". \n"); + } + printf ("Added %d unique messages to the database.\n\n", + add_files_state.added_messages); - notmuch_database_close (notmuch); + printf ("When new mail is delivered to %s in the future,\n" + "run \"notmuch new\" to add it to the database.\n", + mail_directory); - free (mail_directory); - - return 0; + if (ret) { + printf ("Note: At least one error was encountered: %s\n", + notmuch_status_to_string (ret)); + } + + DONE: + if (mail_directory) + free (mail_directory); + if (notmuch) + notmuch_database_close (notmuch); + + return ret; +} + +int +new_command (int argc, char *argv[]) +{ + notmuch_database_t *notmuch; + const char *mail_directory; + add_files_state_t add_files_state; + double elapsed; + struct timeval tv_now; + int ret = 0; + + notmuch = notmuch_database_open (NULL); + if (notmuch == NULL) { + ret = 1; + goto DONE; + } + + mail_directory = notmuch_database_get_path (notmuch); + + add_files_state.total_files = 0; + add_files_state.processed_files = 0; + add_files_state.added_messages = 0; + gettimeofday (&add_files_state.tv_start, NULL); + + ret = add_files (notmuch, mail_directory, &add_files_state); + + gettimeofday (&tv_now, NULL); + elapsed = tv_elapsed (add_files_state.tv_start, + tv_now); + if (add_files_state.processed_files) { + printf ("Processed %d total files in ", add_files_state.processed_files); + 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 new messages to the database (not much, really).\n", + add_files_state.added_messages); + } else { + printf ("No new mail---and that's not much!\n"); + } + + if (ret) { + printf ("Note: At least one error was encountered: %s\n", + notmuch_status_to_string (ret)); + } + + DONE: + if (notmuch) + notmuch_database_close (notmuch); + + return ret; } int @@ -380,7 +543,7 @@ int dump_command (int argc, char *argv[]) { FILE *output; - notmuch_database_t *notmuch = NULL; + notmuch_database_t *notmuch; notmuch_query_t *query; notmuch_results_t *results; notmuch_message_t *message; @@ -456,7 +619,7 @@ int restore_command (int argc, char *argv[]) { FILE *input; - notmuch_database_t *notmuch = NULL; + notmuch_database_t *notmuch; char *line = NULL; size_t line_size, line_len; regex_t regex; @@ -515,9 +678,8 @@ restore_command (int argc, char *argv[]) message = notmuch_database_find_message (notmuch, message_id); if (message == NULL) { - fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n", + fprintf (stderr, "Warning: Cannot apply tags to missing message: %s (", message_id); - goto NEXT_LINE; } next = tags; @@ -525,19 +687,25 @@ restore_command (int argc, char *argv[]) tag = strsep (&next, " "); if (*tag == '\0') continue; - status = notmuch_message_add_tag (message, tag); - if (status) { - fprintf (stderr, - "Error applying tag %s to message %s:\n", - tag, message_id); - fprintf (stderr, "%s\n", - notmuch_status_to_string (status)); + if (message) { + status = notmuch_message_add_tag (message, tag); + if (status) { + fprintf (stderr, + "Error applying tag %s to message %s:\n", + tag, message_id); + fprintf (stderr, "%s\n", + notmuch_status_to_string (status)); + } + } else { + fprintf (stderr, "%s ", tag); } } - notmuch_message_destroy (message); + if (message) + notmuch_message_destroy (message); + else + fprintf (stderr, ")\n"); } - NEXT_LINE: free (message_id); free (tags); } @@ -558,6 +726,8 @@ command_t commands[] = { "Interactively setup notmuch for first use.\n" "\t\tInvoking notmuch with no command argument will run setup if\n" "\t\tthe setup command has not previously been completed." }, + { "new", new_command, + "Find and import any new messages."}, { "search", search_command, " [...]\n\n" "\t\tSearch for threads matching the given search terms.\n"