X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=757f09d797b6df0f51bb6b6ef2cc51315884f93e;hp=4b16a71eb7352321f657fb08f8de7e6d88f0ff3a;hb=a1135f0b7e67db7056a4ef02d61b8ad0ec46e88b;hpb=450b054245ffa30d447e50c3087fddf0e9716d70 diff --git a/notmuch.c b/notmuch.c index 4b16a71e..757f09d7 100644 --- a/notmuch.c +++ b/notmuch.c @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -123,6 +124,14 @@ print_formatted_seconds (double seconds) printf ("%ds", (int) seconds); } +static volatile sig_atomic_t do_add_files_print_progress = 0; + +static void +handle_sigalrm (unused (int signal)) +{ + do_add_files_print_progress = 1; +} + static void add_files_print_progress (add_files_state_t *state) { @@ -298,8 +307,10 @@ add_files_recursive (notmuch_database_t *notmuch, message = NULL; } - if (state->processed_files % 1000 == 0) + if (do_add_files_print_progress) { + do_add_files_print_progress = 0; add_files_print_progress (state); + } } } else if (S_ISDIR (st->st_mode)) { status = add_files_recursive (notmuch, next, st, state); @@ -327,16 +338,17 @@ add_files_recursive (notmuch_database_t *notmuch, } /* This is the top-level entry point for add_files. It does a couple - * of error checks, and then calls into the recursive function, - * (avoiding the repeating of these error checks at every - * level---which would be useless becaues we already do a stat() at - * the level above). */ + * of error checks, sets up the progress-printing timer and then calls + * into the recursive function. */ static notmuch_status_t add_files (notmuch_database_t *notmuch, const char *path, add_files_state_t *state) { struct stat st; + notmuch_status_t status; + struct sigaction action; + struct itimerval timerval; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -349,7 +361,34 @@ add_files (notmuch_database_t *notmuch, return NOTMUCH_STATUS_FILE_ERROR; } - return add_files_recursive (notmuch, path, &st, state); + /* Setup our handler for SIGALRM */ + memset (&action, 0, sizeof (struct sigaction)); + action.sa_handler = handle_sigalrm; + sigemptyset (&action.sa_mask); + action.sa_flags = SA_RESTART; + sigaction (SIGALRM, &action, NULL); + + /* Then start a timer to send SIGALRM once per second. */ + timerval.it_interval.tv_sec = 1; + timerval.it_interval.tv_usec = 0; + timerval.it_value.tv_sec = 1; + timerval.it_value.tv_usec = 0; + setitimer (ITIMER_REAL, &timerval, NULL); + + status = add_files_recursive (notmuch, path, &st, state); + + /* Now stop the timer. */ + timerval.it_interval.tv_sec = 0; + timerval.it_interval.tv_usec = 0; + timerval.it_value.tv_sec = 0; + timerval.it_value.tv_usec = 0; + setitimer (ITIMER_REAL, &timerval, NULL); + + /* And disable the signal handler. */ + action.sa_handler = SIG_IGN; + sigaction (SIGALRM, &action, NULL); + + return status; } /* Recursively count all regular files in path and all sub-direcotries @@ -492,6 +531,30 @@ setup_command (unused (int argc), unused (char *argv[])) free (default_path); } + /* Coerce th directory into an absolute directory name. */ + if (*mail_directory != '/') { + char *cwd, *absolute_mail_directory; + + cwd = getcwd (NULL, 0); + if (cwd == NULL) { + fprintf (stderr, "Out of memory.\n"); + exit (1); + } + + if (asprintf (&absolute_mail_directory, "%s/%s", + cwd, mail_directory) < 0) + { + fprintf (stderr, "Out of memory.\n"); + exit (1); + } + + free (cwd); + free (mail_directory); + mail_directory = absolute_mail_directory; + + printf ("Abs: %s\n", mail_directory); + } + notmuch = notmuch_database_create (mail_directory); if (notmuch == NULL) { fprintf (stderr, "Failed to create new notmuch database at %s\n", @@ -1037,12 +1100,16 @@ help_command (int argc, char *argv[]); command_t commands[] = { { "setup", setup_command, "Interactively setup notmuch for first use.", + "\t\tThe setup command is the first command you will run in order\n" + "\t\tto start using notmuch. It will prompt you for the directory\n" + "\t\tcontaining your email archives, and will then proceed to build\n" + "\t\ta database to allow fast searching of that mail.\n\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.", "\t\tScans all sub-directories of the database, adding new messages\n" - "\t\tthat are found. Each new message will be tagges as both\n" + "\t\tthat are found. Each new message will be tagged as both\n" "\t\t\"inbox\" and \"unread\".\n" "\n" "\t\tNote: \"notmuch new\" will skip any read-only directories,\n" @@ -1051,16 +1118,42 @@ command_t commands[] = { { "search", search_command, " [...]\n\n" "\t\tSearch for threads matching the given search terms.", - "\t\tOnce we actually implement search we'll document the\n" - "\t\tsyntax here." }, + "\t\tNote that the individual mail messages will be matched\n" + "\t\tagainst the search terms, but the results will be the\n" + "\t\tthreads containing the matched messages.\n\n" + "\t\tCurrently, the supported search terms are as follows, (where\n" + "\t\t indicate user-supplied values):\n\n" + "\t\t\ttag:\n" + "\t\t\tid:\n" + "\t\t\tthread:\n\n" + "\t\tValid tag values include \"inbox\" and \"unread\" by default\n" + "\t\tfor new messages added by \"notmuch new\" as well as any other\n" + "\t\ttag values added manually with \"notmuch tag\".\n\n" + "\t\tMessage ID values are the literal contents of the Message-ID:\n" + "\t\theader of email messages, but without the '<','>' delimiters.\n\n" + "\t\tThread ID values are generated internally by notmuch but can\n" + "\t\tbe seen in the output of \"notmuch search\" for example.\n\n" + "\t\tIn addition to individual terms, multiple terms can be\n" + "\t\tcombined with Boolean operators (\"and\", \"or\", \"not\", etc.).\n" + "\t\tEach term in the query will be implicitly connected by a\n" + "\t\tlogical AND if no explicit operator is provided, (except\n" + "\t\tthat terms with a common prefix will be implicitly combined\n" + "\t\twith OR until we get Xapian defect #402 fixed).\n\n" + "\t\tParentheses can also be used to control the combination of\n" + "\t\tthe Boolean operators, but will have to be protected from\n" + "\t\tinterpretation by the shell, (such as by putting quotation\n" + "\t\tmarks around any parenthesized expression)." }, { "show", show_command, "\n\n" + "\t\tNote: The \"notmuch show\" command is not implemented yet.\n\n" "\t\tShow the thread with the given thread ID (see 'search').", - "" }, + "\t\tThread ID values are given as the first column in the\n" + "\t\toutput of the \"notmuch search\" command. These are the\n" + "\t\trandom-looking strings of 32 characters." }, { "tag", tag_command, "+|- [...] [--] [...]\n\n" "\t\tAdd/remove tags for all messages matching the search terms.", - "\t\tThe search terms are handled texactly as in 'search' so one\n" + "\t\tThe search terms are handled exactly as in 'search' so one\n" "\t\tcan use that command first to see what will be modified.\n\n" "\t\tTags prefixed by '+' are added while those prefixed by '-' are\n" "\t\tremoved. For each message, tag removal is before tag addition.\n\n" @@ -1068,7 +1161,13 @@ command_t commands[] = { "\t\targument that begins with neither '+' nor '-'. Support for\n" "\t\tan initial search term beginning with '+' or '-' is provided\n" "\t\tby allowing the user to specify a \"--\" argument to separate\n" - "\t\tthe tags from the search terms." }, + "\t\tthe tags from the search terms.\n\n" + "\t\tNote: If you run \"notmuch new\" between reading a thread with\n" + "\t\t\"notmuch show\" and removing the \"inbox\" tag for that thread\n" + "\t\twith \"notmuch tag\" then you create the possibility of moving\n" + "\t\tsome messages from that thread out of your inbox without ever\n" + "\t\treading them. The easiest way to avoid this problem is to not\n" + "\t\trun \"notmuch new\" between reading and removing tags." }, { "dump", dump_command, "[]\n\n" "\t\tCreate a plain-text dump of the tags for each message.", @@ -1077,15 +1176,20 @@ command_t commands[] = { "\t\tthat can't be recreated from the messages themselves.\n" "\t\tThe output of notmuch dump is therefore the only\n" "\t\tcritical thing to backup (and much more friendly to\n" - "\t\tincremental backup than the native database files." }, + "\t\tincremental backup than the native database files.)" }, { "restore", restore_command, "\n\n" "\t\tRestore the tags from the given dump file (see 'dump').", - "" }, + "\t\tNote: The dump file format is specifically chosen to be\n" + "\t\tcompatible with the format of files produced by sup-dump.\n" + "\t\tSo if you've previously been using sup for mail, then the\n" + "\t\t\"notmuch restore\" command provides you a way to import\n" + "\t\tall of your tags (or labels as sup calls them)." }, { "help", help_command, "[]\n\n" "\t\tThis message, or more detailed help for the named command.", - "" } + "\t\tExcept in this case, where there's not much more detailed\n" + "\t\thelp available." } }; static void