X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=c5fef0e800961782a1941d2999a4be6f4c6146c0;hp=bfc0735b56aacf696a23182947c1669cf3503b6f;hb=be9e3ee3132457ea5936bd1225294bdfe3949a4c;hpb=ef944693c354eb1e7ec6c578a0f4c14616fc6d60 diff --git a/notmuch.c b/notmuch.c index bfc0735b..c5fef0e8 100644 --- a/notmuch.c +++ b/notmuch.c @@ -43,6 +43,20 @@ #include /* g_strdup_printf */ +/* There's no point in continuing when we've detected that we've done + * something wrong internally (as opposed to the user passing in a + * bogus value). + * + * Note that __location__ comes from talloc.h. + */ +#define INTERNAL_ERROR(format, ...) \ + do { \ + fprintf(stderr, \ + "Internal error: " format " (%s)\n", \ + ##__VA_ARGS__, __location__); \ + exit (1); \ + } while (0) + #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) typedef int (*command_function_t) (int argc, char *argv[]); @@ -54,6 +68,9 @@ typedef struct command { } command_t; typedef struct { + int ignore_read_only_directories; + int saw_read_only_directory; + int total_files; int processed_files; int added_messages; @@ -160,6 +177,17 @@ add_files_recursive (notmuch_database_t *notmuch, time_t path_mtime, path_dbtime; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; + /* If we're told to, we bail out on encountering a read-only + * directory, (with this being a clear clue from the user to + * Notmuch that new mail won't be arriving there and we need not + * look. */ + if (state->ignore_read_only_directories && + (st->st_mode & S_IWUSR) == 0) + { + state->saw_read_only_directory = TRUE; + goto DONE; + } + path_mtime = st->st_mtime; path_dbtime = notmuch_database_get_timestamp (notmuch, path); @@ -241,8 +269,7 @@ add_files_recursive (notmuch_database_t *notmuch, ret = status; goto DONE; default: - fprintf (stderr, "Internal error: add_message returned unexpected value: %d\n", status); - ret = status; + INTERNAL_ERROR ("add_message returned unexpected value: %d", status); goto DONE; } if (state->processed_files % 1000 == 0) @@ -258,7 +285,9 @@ add_files_recursive (notmuch_database_t *notmuch, next = NULL; } - notmuch_database_set_timestamp (notmuch, path, path_mtime); + status = notmuch_database_set_timestamp (notmuch, path, path_mtime); + if (status && ret == NOTMUCH_STATUS_SUCCESS) + ret = status; DONE: if (next) @@ -448,6 +477,8 @@ setup_command (int argc, char *argv[]) printf ("Next, we'll inspect the messages and create a database of threads:\n"); + add_files_state.ignore_read_only_directories = FALSE; + add_files_state.saw_read_only_directory = FALSE; add_files_state.total_files = count; add_files_state.processed_files = 0; add_files_state.added_messages = 0; @@ -476,7 +507,7 @@ setup_command (int argc, char *argv[]) } printf ("When new mail is delivered to %s in the future,\n" - "run \"notmuch new\" to add it to the database.\n", + "run \"notmuch new\" to add it to the database.\n\n", mail_directory); if (ret) { @@ -511,6 +542,8 @@ new_command (int argc, char *argv[]) mail_directory = notmuch_database_get_path (notmuch); + add_files_state.ignore_read_only_directories = TRUE; + add_files_state.saw_read_only_directory = FALSE; add_files_state.total_files = 0; add_files_state.processed_files = 0; add_files_state.added_messages = 0; @@ -539,11 +572,18 @@ new_command (int argc, char *argv[]) add_files_state.added_messages == 1 ? "message" : "messages"); } else { - printf ("No new mail---and that's not much!\n"); + printf ("No new mail---and that's not much.\n"); + } + + if (elapsed > 1 && ! add_files_state.saw_read_only_directory) { + printf ("\nTip: If you have any sub-directories that are archives (that is,\n" + "they will never receive new mail), marking these directores as\n" + "read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n" + "much more efficient (it won't even look in those directories).\n"); } if (ret) { - printf ("Note: At least one error was encountered: %s\n", + printf ("\nNote: At least one error was encountered: %s\n", notmuch_status_to_string (ret)); } @@ -557,8 +597,73 @@ new_command (int argc, char *argv[]) int search_command (int argc, char *argv[]) { - fprintf (stderr, "Error: search is not implemented yet.\n"); - return 1; + void *local = talloc_new (NULL); + notmuch_database_t *notmuch = NULL; + notmuch_query_t *query; + notmuch_results_t *results; + notmuch_message_t *message; + notmuch_tags_t *tags; + char *query_str; + int i; + notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; + + notmuch = notmuch_database_open (NULL); + if (notmuch == NULL) { + ret = 1; + goto DONE; + } + + /* XXX: Should add xtalloc wrappers here and use them. */ + query_str = talloc_strdup (local, ""); + + for (i = 0; i < argc; i++) { + if (i != 0) + query_str = talloc_asprintf_append (query_str, " "); + + query_str = talloc_asprintf_append (query_str, "%s", argv[i]); + } + + query = notmuch_query_create (notmuch, query_str); + if (query == NULL) { + fprintf (stderr, "Out of memory\n"); + ret = 1; + goto DONE; + } + + for (results = notmuch_query_search (query); + notmuch_results_has_more (results); + notmuch_results_advance (results)) + { + int first = 1; + message = notmuch_results_get (results); + + printf ("%s (", notmuch_message_get_message_id (message)); + + for (tags = notmuch_message_get_tags (message); + notmuch_tags_has_more (tags); + notmuch_tags_advance (tags)) + { + if (! first) + printf (" "); + + printf ("%s", notmuch_tags_get (tags)); + + first = 0; + } + + printf (")\n"); + + notmuch_message_destroy (message); + } + + notmuch_query_destroy (query); + + DONE: + if (notmuch) + notmuch_database_close (notmuch); + talloc_free (local); + + return ret; } int @@ -572,7 +677,7 @@ int dump_command (int argc, char *argv[]) { FILE *output; - notmuch_database_t *notmuch; + notmuch_database_t *notmuch = NULL; notmuch_query_t *query; notmuch_results_t *results; notmuch_message_t *message; @@ -648,7 +753,7 @@ int restore_command (int argc, char *argv[]) { FILE *input; - notmuch_database_t *notmuch; + notmuch_database_t *notmuch = NULL; char *line = NULL; size_t line_size, line_len; regex_t regex; @@ -726,7 +831,8 @@ restore_command (int argc, char *argv[]) notmuch_status_to_string (status)); } } else { - fprintf (stderr, "%s ", tag); + fprintf (stderr, "%s%s", + tag == tags ? "" : " ", tag); } } @@ -752,11 +858,15 @@ restore_command (int argc, char *argv[]) command_t commands[] = { { "setup", setup_command, - "Interactively setup notmuch for first use.\n" + "Interactively setup notmuch for first use.\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."}, + "Find and import any new messages.\n\n" + "\t\tScans all sub-directories of the database, adding new files\n" + "\t\tthat are found. Note: \"notmuch new\" will skip any\n" + "\t\tread-only directories, so you can use that to mark\n" + "\t\tdirectories that will not receive any new mail."}, { "search", search_command, " [...]\n\n" "\t\tSearch for threads matching the given search terms.\n"