*
* 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))
+ * 5 mins. ago (For times less than 60 minutes ago)
+ * Today 12:30 (For times >60 minutes but still today)
+ * Yest. 12:30
+ * Mon. 12:30 (Before yesterday but fewer than 7 days ago)
+ * October 12 (Between 7 and 180 days ago (about 6 months))
* 2008-06-30 (More than 180 days ago)
*/
#define MINUTE (60)
if (delta < 3600) {
snprintf (result, RELATIVE_DATE_MAX,
- "%d minutes ago", (int) (delta / 60));
+ "%d mins. ago", (int) (delta / 60));
return result;
}
delta < DAY)
{
strftime (result, RELATIVE_DATE_MAX,
- "%R", &tm_then); /* 12:30 */
+ "Today %R", &tm_then); /* Today 12:30 */
return result;
} else if ((tm_now.tm_wday + 7 - tm_then.tm_wday) % 7 == 1) {
- return "Yesterday";
+ strftime (result, RELATIVE_DATE_MAX,
+ "Yest. %R", &tm_then); /* Yest. 12:30 */
+ return result;
} else {
if (tm_then.tm_wday != tm_now.tm_wday) {
strftime (result, RELATIVE_DATE_MAX,
- "%A", &tm_then); /* Monday */
+ "%a. %R", &tm_then); /* Mon. 12:30 */
return result;
}
}
}
strftime (result, RELATIVE_DATE_MAX,
- "%b %d", &tm_then); /* Oct. 12 */
+ "%B %d", &tm_then); /* October 12 */
return result;
}
#undef MINUTE
date = notmuch_thread_get_oldest_date (thread);
relative_date = _format_relative_date (local, date);
- printf ("%s (%s) %s",
+ printf ("%s %12s %s",
notmuch_thread_get_thread_id (thread),
relative_date,
notmuch_thread_get_subject (thread));
}
static void
-show_message_part (GMimeObject *part)
+show_message_part (GMimeObject *part, int *part_count)
{
GMimeStream *stream;
GMimeDataWrapper *wrapper;
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
+ *part_count = *part_count + 1;
+
if (GMIME_IS_MULTIPART (part)) {
GMimeMultipart *multipart = GMIME_MULTIPART (part);
int i;
if (i > 1)
fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");
}
- show_message_part (g_mime_multipart_get_part (multipart, i));
+ show_message_part (g_mime_multipart_get_part (multipart, i),
+ part_count);
}
return;
}
mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
- show_message_part (g_mime_message_get_mime_part (mime_message));
+ show_message_part (g_mime_message_get_mime_part (mime_message),
+ part_count);
return;
}
const char *filename = g_mime_part_get_filename (GMIME_PART (part));
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
- printf ("%%attachment{ Content-type: %s\n",
+ printf ("%%attachment{ ID: %d, Content-type: %s, ",
+ *part_count,
g_mime_content_type_to_string (content_type));
- printf ("%s\n", filename);
+ printf ("Filename: %s ", filename);
printf ("%%attachment}\n");
return;
}
- /* Stream the MIME part out to stdout. */
content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
- printf ("%%part{ Content-type: %s\n",
+ printf ("%%part{ ID: %d, Content-type: %s\n",
+ *part_count,
g_mime_content_type_to_string (content_type));
- stream = g_mime_stream_file_new (stdout);
- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
+ if (g_mime_content_type_is_type (content_type, "text", "*") &&
+ !g_mime_content_type_is_type (content_type, "text", "html"))
+ {
+ stream = g_mime_stream_file_new (stdout);
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
- wrapper = g_mime_part_get_content_object (GMIME_PART (part));
- if (wrapper)
- g_mime_data_wrapper_write_to_stream (wrapper, stream);
+ wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+ if (wrapper)
+ g_mime_data_wrapper_write_to_stream (wrapper, stream);
+ }
printf ("%%part}\n");
notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
static int initialized = 0;
FILE *file = NULL;
+ int part_count = 0;
if (! initialized) {
g_mime_init (0);
mime_message = g_mime_parser_construct_message (parser);
- show_message_part (g_mime_message_get_mime_part (mime_message));
+ show_message_part (g_mime_message_get_mime_part (mime_message),
+ &part_count);
DONE:
if (mime_message)