X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=4779a96141a483fc2a5c4d98c6c44ec216885933;hp=4ac5531ae42a14c8216e3977cfc7dc8a495fbb29;hb=c96021a47705bdb2ac189d52825a8edc033d35dd;hpb=8b93875b2705caa10d33e6fc71ebce6f41fdd79b diff --git a/notmuch.c b/notmuch.c index 4ac5531a..4779a961 100644 --- a/notmuch.c +++ b/notmuch.c @@ -733,16 +733,91 @@ query_string_from_args (void *ctx, int argc, char *argv[]) return query_string; } +/* Format a nice representation of 'time' relative to the current time. + * + * Examples include: + * + * 5 minutes ago (For times less than 60 minutes ago) + * 12:30 (For times >60 minutes but still today) + * Yesterday + * Monday (Before yesterday but fewer than 7 days ago) + * Oct. 12 (Between 7 and 180 days ago (about 6 months)) + * 2008-06-30 (More than 180 days ago) + */ +#define MINUTE (60) +#define HOUR (60 * MINUTE) +#define DAY (24 * HOUR) +#define RELATIVE_DATE_MAX 20 +static const char * +_format_relative_date (void *ctx, time_t then) +{ + struct tm tm_now, tm_then; + time_t now = time(NULL); + time_t delta; + char *result; + + localtime_r (&now, &tm_now); + localtime_r (&then, &tm_then); + + result = talloc_zero_size (ctx, RELATIVE_DATE_MAX); + if (result == NULL) + return "when?"; + + if (then > now) + return "the future"; + + delta = now - then; + + if (delta > 180 * DAY) { + strftime (result, RELATIVE_DATE_MAX, + "%F", &tm_then); /* 2008-06-30 */ + return result; + } + + if (delta < 3600) { + snprintf (result, RELATIVE_DATE_MAX, + "%d minutes ago", (int) (delta / 60)); + return result; + } + + if (delta <= 7 * DAY) { + if (tm_then.tm_wday == tm_now.tm_wday && + delta < DAY) + { + strftime (result, RELATIVE_DATE_MAX, + "%R", &tm_then); /* 12:30 */ + return result; + } else if ((tm_now.tm_wday + 7 - tm_then.tm_wday) % 7 == 1) { + return "Yesterday"; + } else { + if (tm_then.tm_wday != tm_now.tm_wday) { + strftime (result, RELATIVE_DATE_MAX, + "%A", &tm_then); /* Monday */ + return result; + } + } + } + + strftime (result, RELATIVE_DATE_MAX, + "%b %d", &tm_then); /* Oct. 12 */ + return result; +} +#undef MINUTE +#undef HOUR +#undef DAY + static int search_command (int argc, char *argv[]) { void *local = talloc_new (NULL); notmuch_database_t *notmuch = NULL; notmuch_query_t *query; - notmuch_thread_results_t *results; + notmuch_threads_t *threads; notmuch_thread_t *thread; notmuch_tags_t *tags; char *query_str; + const char *relative_date; + time_t date; notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; notmuch = notmuch_database_open (NULL); @@ -760,16 +835,20 @@ search_command (int argc, char *argv[]) goto DONE; } - for (results = notmuch_query_search_threads (query); - notmuch_thread_results_has_more (results); - notmuch_thread_results_advance (results)) + for (threads = notmuch_query_search_threads (query); + notmuch_threads_has_more (threads); + notmuch_threads_advance (threads)) { int first = 1; - thread = notmuch_thread_results_get (results); + thread = notmuch_threads_get (threads); + + date = notmuch_thread_get_oldest_date (thread); + relative_date = _format_relative_date (local, date); - printf ("%s %s", + printf ("%s (%s) %s", notmuch_thread_get_thread_id (thread), + relative_date, notmuch_thread_get_subject (thread)); printf (" ("); @@ -797,6 +876,26 @@ search_command (int argc, char *argv[]) return ret; } +/* Get a nice, single-line summary of message. */ +static const char * +_get_one_line_summary (void *ctx, notmuch_message_t *message) +{ + const char *from; + time_t date; + const char *relative_date; + const char *subject; + + from = notmuch_message_get_header (message, "from"); + + date = notmuch_message_get_date (message); + relative_date = _format_relative_date (ctx, date); + + subject = notmuch_message_get_header (message, "subject"); + + return talloc_asprintf (ctx, "%s (%s) %s", + from, relative_date, subject); +} + static int show_command (unused (int argc), unused (char *argv[])) { @@ -804,7 +903,7 @@ show_command (unused (int argc), unused (char *argv[])) char *query_string; notmuch_database_t *notmuch = NULL; notmuch_query_t *query = NULL; - notmuch_message_results_t *messages; + notmuch_messages_t *messages; notmuch_message_t *message; const char *filename; FILE *file; @@ -844,15 +943,17 @@ show_command (unused (int argc), unused (char *argv[])) } for (messages = notmuch_query_search_messages (query); - notmuch_message_results_has_more (messages); - notmuch_message_results_advance (messages)) + notmuch_messages_has_more (messages); + notmuch_messages_advance (messages)) { - message = notmuch_message_results_get (messages); + message = notmuch_messages_get (messages); printf ("%%message{\n"); printf ("%%header{\n"); + printf ("%s\n", _get_one_line_summary (local, message)); + for (i = 0; i < ARRAY_SIZE (headers); i++) { name = headers[i]; value = notmuch_message_get_header (message, name); @@ -905,7 +1006,7 @@ tag_command (unused (int argc), unused (char *argv[])) char *query_string; notmuch_database_t *notmuch = NULL; notmuch_query_t *query; - notmuch_message_results_t *results; + notmuch_messages_t *messages; notmuch_message_t *message; int ret = 0; int i; @@ -969,11 +1070,11 @@ tag_command (unused (int argc), unused (char *argv[])) goto DONE; } - for (results = notmuch_query_search_messages (query); - notmuch_message_results_has_more (results); - notmuch_message_results_advance (results)) + for (messages = notmuch_query_search_messages (query); + notmuch_messages_has_more (messages); + notmuch_messages_advance (messages)) { - message = notmuch_message_results_get (results); + message = notmuch_messages_get (messages); notmuch_message_freeze (message); @@ -1006,7 +1107,7 @@ dump_command (int argc, char *argv[]) FILE *output = NULL; notmuch_database_t *notmuch = NULL; notmuch_query_t *query; - notmuch_message_results_t *results; + notmuch_messages_t *messages; notmuch_message_t *message; notmuch_tags_t *tags; int ret = 0; @@ -1038,12 +1139,12 @@ dump_command (int argc, char *argv[]) notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID); - for (results = notmuch_query_search_messages (query); - notmuch_message_results_has_more (results); - notmuch_message_results_advance (results)) + for (messages = notmuch_query_search_messages (query); + notmuch_messages_has_more (messages); + notmuch_messages_advance (messages)) { int first = 1; - message = notmuch_message_results_get (results); + message = notmuch_messages_get (messages); fprintf (output, "%s (", notmuch_message_get_message_id (message)); @@ -1349,8 +1450,8 @@ main (int argc, char *argv[]) /* Don't complain about "help" being an unknown command when we're about to provide exactly what's wanted anyway. */ - fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]); - usage (); + fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", + argv[1]); return 1; }