X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=a7559fc7a6266a034f6b8580819ff0ca9a2be1e9;hp=cc53d1d61644699a003cdcac71281eff1cc0cb60;hb=203a717d64864411eb6802c06a5a0ad1cf98e077;hpb=3dce2007887717ec4ec0a1e815591c957acd1ba1 diff --git a/notmuch.c b/notmuch.c index cc53d1d6..a7559fc7 100644 --- a/notmuch.c +++ b/notmuch.c @@ -41,8 +41,6 @@ #include -#include /* g_strdup_printf */ - #define unused(x) x __attribute__ ((unused)) /* There's no point in continuing when we've detected that we've done @@ -69,6 +67,8 @@ typedef struct command { const char *usage; } command_t; +typedef void (*add_files_callback_t) (notmuch_message_t *message); + typedef struct { int ignore_read_only_directories; int saw_read_only_directory; @@ -77,6 +77,8 @@ typedef struct { int processed_files; int added_messages; struct timeval tv_start; + + add_files_callback_t callback; } add_files_state_t; static void @@ -178,6 +180,7 @@ add_files_recursive (notmuch_database_t *notmuch, char *next = NULL; time_t path_mtime, path_dbtime; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; + notmuch_message_t *message = NULL, **closure; /* If we're told to, we bail out on encountering a read-only * directory, (with this being a clear clue from the user to @@ -236,7 +239,7 @@ add_files_recursive (notmuch_database_t *notmuch, continue; } - next = g_strdup_printf ("%s/%s", path, entry->d_name); + next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); if (stat (next, st)) { fprintf (stderr, "Error reading %s: %s\n", @@ -251,11 +254,18 @@ add_files_recursive (notmuch_database_t *notmuch, if (st->st_mtime > path_dbtime) { state->processed_files++; - status = notmuch_database_add_message (notmuch, next); + if (state->callback) + closure = &message; + else + closure = NULL; + + status = notmuch_database_add_message (notmuch, next, closure); switch (status) { /* success */ case NOTMUCH_STATUS_SUCCESS: state->added_messages++; + if (state->callback) + (state->callback) (message); break; /* Non-fatal issues (go on to next file) */ case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: @@ -276,10 +286,17 @@ add_files_recursive (notmuch_database_t *notmuch, case NOTMUCH_STATUS_FILE_ERROR: case NOTMUCH_STATUS_NULL_POINTER: case NOTMUCH_STATUS_TAG_TOO_LONG: + case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW: case NOTMUCH_STATUS_LAST_STATUS: INTERNAL_ERROR ("add_message returned unexpected value: %d", status); goto DONE; } + + if (message) { + notmuch_message_destroy (message); + message = NULL; + } + if (state->processed_files % 1000 == 0) add_files_print_progress (state); } @@ -289,7 +306,7 @@ add_files_recursive (notmuch_database_t *notmuch, ret = status; } - free (next); + talloc_free (next); next = NULL; } @@ -299,7 +316,7 @@ add_files_recursive (notmuch_database_t *notmuch, DONE: if (next) - free (next); + talloc_free (next); if (entry) free (entry); if (dir) @@ -342,7 +359,7 @@ static void count_files (const char *path, int *count) { DIR *dir; - struct dirent *entry, *e; + struct dirent *e, *entry = NULL; int entry_length; int err; char *next; @@ -353,7 +370,7 @@ count_files (const char *path, int *count) if (dir == NULL) { fprintf (stderr, "Warning: failed to open directory %s: %s\n", path, strerror (errno)); - return; + goto DONE; } entry_length = offsetof (struct dirent, d_name) + @@ -366,7 +383,7 @@ count_files (const char *path, int *count) fprintf (stderr, "Error reading directory: %s\n", strerror (errno)); free (entry); - return; + goto DONE; } if (e == NULL) @@ -384,7 +401,12 @@ count_files (const char *path, int *count) continue; } - next = g_strdup_printf ("%s/%s", path, entry->d_name); + 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); @@ -401,7 +423,9 @@ count_files (const char *path, int *count) free (next); } - free (entry); + DONE: + if (entry) + free (entry); closedir (dir); } @@ -490,6 +514,7 @@ setup_command (unused (int argc), unused (char *argv[])) add_files_state.total_files = count; 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); @@ -532,6 +557,13 @@ setup_command (unused (int argc), unused (char *argv[])) return ret; } +static void +tag_inbox_and_unread (notmuch_message_t *message) +{ + notmuch_message_add_tag (message, "inbox"); + notmuch_message_add_tag (message, "unread"); +} + static int new_command (unused (int argc), unused (char *argv[])) { @@ -555,6 +587,7 @@ new_command (unused (int argc), unused (char *argv[])) add_files_state.total_files = 0; add_files_state.processed_files = 0; add_files_state.added_messages = 0; + add_files_state.callback = tag_inbox_and_unread; gettimeofday (&add_files_state.tv_start, NULL); ret = add_files (notmuch, mail_directory, &add_files_state); @@ -610,6 +643,7 @@ search_command (int argc, char *argv[]) notmuch_query_t *query; notmuch_thread_results_t *results; notmuch_thread_t *thread; + notmuch_tags_t *tags; char *query_str; int i; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; @@ -641,9 +675,25 @@ search_command (int argc, char *argv[]) notmuch_thread_results_has_more (results); notmuch_thread_results_advance (results)) { + int first = 1; + thread = notmuch_thread_results_get (results); - printf ("%s\n", notmuch_thread_get_thread_id (thread)); + printf ("%s %s", + notmuch_thread_get_thread_id (thread), + notmuch_thread_get_subject (thread)); + + printf (" ("); + for (tags = notmuch_thread_get_tags (thread); + notmuch_tags_has_more (tags); + notmuch_tags_advance (tags)) + { + if (! first) + printf (" "); + printf ("%s", notmuch_tags_get (tags)); + first = 0; + } + printf (")\n"); notmuch_thread_destroy (thread); } @@ -805,35 +855,34 @@ 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 (", + fprintf (stderr, "Warning: Cannot apply tags to missing message: %s\n", message_id); + goto NEXT_LINE; } + notmuch_message_freeze (message); + + notmuch_message_remove_all_tags (message); + 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%s", - tag == tags ? "" : " ", tag); + 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) - notmuch_message_destroy (message); - else - fprintf (stderr, ")\n"); + notmuch_message_thaw (message); + notmuch_message_destroy (message); } + NEXT_LINE: free (message_id); free (tags); } @@ -858,10 +907,13 @@ command_t commands[] = { "\t\tthe setup command has not previously been completed." }, { "new", new_command, "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."}, + "\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\t\"inbox\" and \"unread\".\n" + "\n" + "\t\tNote: \"notmuch new\" will skip any read-only directories,\n" + "\t\tso you can use that to mark tdirectories that will not\n" + "\t\treceive any new mail (and make \"notmuch new\" faster)." }, { "search", search_command, " [...]\n\n" "\t\tSearch for threads matching the given search terms.\n"