X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=770db73abcce4ea73df9aea191e78611f8714609;hp=e157f02f468583f86149032fd18b26f3f0202429;hb=a7a897b883d10e431be40e97156b75fdc4d3827a;hpb=0e914d9e9646349976c16472be9e986ad4b3e29e diff --git a/notmuch.c b/notmuch.c index e157f02f..770db73a 100644 --- a/notmuch.c +++ b/notmuch.c @@ -18,17 +18,21 @@ * Author: Carl Worth */ -#include "notmuch.h" - #ifndef _GNU_SOURCE #define _GNU_SOURCE /* for getline */ #endif - #include -#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 + * develop notmuch.h into a plausible library interface). + */ +#include "xutil.h" + #include #include -#include #include #include #include @@ -50,11 +54,19 @@ 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; +static void +chomp_newline (char *str) +{ + if (str && str[strlen(str)-1] == '\n') + str[strlen(str)-1] = '\0'; +} + /* Compute the number of seconds elapsed from start to end. */ double tv_elapsed (struct timeval start, struct timeval end) @@ -81,7 +93,7 @@ print_formatted_seconds (double seconds) seconds -= minutes * 60; } - printf ("%02ds", (int) seconds); + printf ("%ds", (int) seconds); } void @@ -93,13 +105,18 @@ 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); } @@ -159,14 +176,15 @@ add_files (notmuch_database_t *notmuch, const char *path, stat (next, &st); if (S_ISREG (st.st_mode)) { + state->processed_files++; 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++; + } else if (status != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) { + state->added_messages++; } - if (state->count % 1000 == 0) + if (state->processed_files % 1000 == 0) add_files_print_progress (state); } else if (S_ISDIR (st.st_mode)) { add_files (notmuch, next, state); @@ -255,13 +273,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"); @@ -287,15 +306,10 @@ 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); - printf ("\n"); + chomp_newline (mail_directory); - if (mail_directory && - mail_directory[strlen(mail_directory)-1] == '\n') - { - mail_directory[strlen(mail_directory)-1] = '\0'; - } + printf ("\n"); if (mail_directory == NULL || strlen (mail_directory) == 0) { if (mail_directory) @@ -321,8 +335,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"); @@ -335,8 +349,9 @@ 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); @@ -344,15 +359,24 @@ setup_command (int argc, char *argv[]) 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)); + printf (" (%d files/sec.). \n", + (int) (add_files_state.processed_files / elapsed)); + 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); + DONE: + if (mail_directory) + free (mail_directory); + if (notmuch) + notmuch_database_close (notmuch); - return 0; + return ret; } int @@ -373,7 +397,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; @@ -411,6 +435,7 @@ dump_command (int argc, char *argv[]) notmuch_results_has_more (results); notmuch_results_advance (results)) { + int first = 1; message = notmuch_results_get (results); fprintf (output, @@ -420,8 +445,6 @@ dump_command (int argc, char *argv[]) notmuch_tags_has_more (tags); notmuch_tags_advance (tags)) { - int first = 1; - if (! first) fprintf (output, " "); @@ -449,8 +472,107 @@ dump_command (int argc, char *argv[]) int restore_command (int argc, char *argv[]) { - fprintf (stderr, "Error: restore is not implemented yet.\n"); - return 1; + FILE *input; + notmuch_database_t *notmuch; + char *line = NULL; + size_t line_size, line_len; + regex_t regex; + int rerr; + int ret = 0; + + if (argc) { + input = fopen (argv[0], "r"); + if (input == NULL) { + fprintf (stderr, "Error opening %s for reading: %s\n", + argv[0], strerror (errno)); + ret = 1; + goto DONE; + } + } else { + printf ("No filename given. Reading dump from stdin.\n"); + input = stdin; + } + + notmuch = notmuch_database_open (NULL); + if (notmuch == NULL) { + ret = 1; + goto DONE; + } + + /* Dump output is one line per message. We match a sequence of + * non-space characters for the message-id, then one or more + * spaces, then a list of space-separated tags as a sequence of + * characters within literal '(' and ')'. */ + xregcomp (®ex, + "^([^ ]+) \\(([^)]*)\\)$", + REG_EXTENDED); + + while ((line_len = getline (&line, &line_size, input)) != -1) { + regmatch_t match[3]; + char *message_id, *tags, *tag, *next; + notmuch_message_t *message; + notmuch_status_t status; + + chomp_newline (line); + + rerr = xregexec (®ex, line, 3, match, 0); + if (rerr == REG_NOMATCH) + { + fprintf (stderr, "Warning: Ignoring invalid input line: %s\n", + line); + continue; + } + + message_id = xstrndup (line + match[1].rm_so, + match[1].rm_eo - match[1].rm_so); + tags = xstrndup (line + match[2].rm_so, + match[2].rm_eo - match[2].rm_so); + + if (strlen (tags)) { + + message = notmuch_database_find_message (notmuch, message_id); + if (message == NULL) { + fprintf (stderr, "Warning: Cannot apply tags to missing message: %s (", + message_id); + } + + next = tags; + while (next) { + tag = strsep (&next, " "); + if (*tag == '\0') + continue; + 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); + } + } + + if (message) + notmuch_message_destroy (message); + else + fprintf (stderr, ")\n"); + } + free (message_id); + free (tags); + } + + regfree (®ex); + + DONE: + if (line) + free (line); + if (notmuch) + notmuch_database_close (notmuch); + + return ret; } command_t commands[] = {