X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=2465e16a3da6c9b0fcf1801a2ba25861a03f5834;hp=f47e4fcbb65d6ddf805ecbedb07c4fa61a097861;hb=c37b1bdf2d871a11672772f83080f3ea9bda1b17;hpb=90a0ef4ac4a023f11f82b037c635b4b22762b12f

diff --git a/notmuch.c b/notmuch.c
index f47e4fcb..2465e16a 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -733,6 +733,79 @@ 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[])
 {
@@ -743,6 +816,8 @@ search_command (int argc, char *argv[])
     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);
@@ -768,8 +843,12 @@ search_command (int argc, char *argv[])
 
 	thread = notmuch_thread_results_get (results);
 
-	printf ("%s %s",
+	date = notmuch_thread_get_oldest_date (thread);
+	relative_date = _format_relative_date (local, date);
+
+	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[]))
 {
@@ -811,6 +910,12 @@ show_command (unused (int argc), unused (char *argv[]))
     int ret = 0;
     int c;
 
+    const char *headers[] = {
+	"Subject", "From", "To", "Cc", "Bcc", "Date"
+    };
+    const char *name, *value;
+    unsigned int i;
+
     if (argc != 1) {
 	fprintf (stderr, "Error: \"notmuch show\" requires exactly one thread-ID argument.\n");
 	ret = 1;
@@ -847,7 +952,14 @@ show_command (unused (int argc), unused (char *argv[]))
 
 	printf ("%%header{\n");
 
-	printf ("%s", notmuch_message_get_all_headers (message));
+	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);
+	    if (value)
+		printf ("%s: %s\n", name, value);
+	}
 
 	printf ("%%header}\n");
 
@@ -1338,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;
 }