X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=27587f8799291d79e5a47342beb7bea3226202fc;hp=20e54bcd0f0a6d665720dbc6354d2824ebdcfe09;hb=5a9d5f2f149b4c3122e2796e782c13a32571696b;hpb=dcdb8430945e6323d78997ce47639eebc683c6d3 diff --git a/notmuch-show.c b/notmuch-show.c index 20e54bcd..27587f87 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -30,8 +30,7 @@ format_headers_text (const void *ctx, static void format_part_text (GMimeObject *part, - int *part_count, - int first); + int *part_count); static void format_part_end_text (GMimeObject *part); @@ -40,7 +39,7 @@ static const notmuch_show_format_t format_text = { "", "\fmessage{ ", format_message_text, "\fheader{\n", format_headers_text, "\fheader}\n", - "\fbody{\n", format_part_text, format_part_end_text, "\fbody}\n", + "\fbody{\n", format_part_text, format_part_end_text, "", "\fbody}\n", "\fmessage}\n", "", "" }; @@ -55,8 +54,7 @@ format_headers_json (const void *ctx, static void format_part_json (GMimeObject *part, - int *part_count, - int first); + int *part_count); static void format_part_end_json (GMimeObject *part); @@ -65,7 +63,7 @@ static const notmuch_show_format_t format_json = { "[", "{", format_message_json, ", \"headers\": {", format_headers_json, "}", - ", \"body\": [", format_part_json, format_part_end_json, "]", + ", \"body\": [", format_part_json, format_part_end_json, ", ", "]", "}", ", ", "]" }; @@ -79,7 +77,7 @@ static const notmuch_show_format_t format_mbox = { "", "", format_message_mbox, "", NULL, "", - "", NULL, NULL, "", + "", NULL, NULL, "", "", "", "", "" }; @@ -357,7 +355,7 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out) } static void -format_part_text (GMimeObject *part, int *part_count, unused (int first)) +format_part_text (GMimeObject *part, int *part_count) { GMimeContentDisposition *disposition; GMimeContentType *content_type; @@ -431,7 +429,7 @@ format_part_end_text (GMimeObject *part) } static void -format_part_json (GMimeObject *part, int *part_count, int first) +format_part_json (GMimeObject *part, int *part_count) { GMimeContentType *content_type; GMimeContentDisposition *disposition; @@ -442,9 +440,6 @@ format_part_json (GMimeObject *part, int *part_count, int first) content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); - if (! first) - fputs (", ", stdout); - printf ("{\"id\": %d, \"content-type\": %s", *part_count, json_quote_str (ctx, g_mime_content_type_to_string (content_type))); @@ -524,7 +519,7 @@ show_messages (void *ctx, const notmuch_show_format_t *format, notmuch_messages_t *messages, int indent, - notmuch_bool_t entire_thread) + notmuch_show_params_t *params) { notmuch_message_t *message; notmuch_bool_t match; @@ -549,15 +544,18 @@ show_messages (void *ctx, next_indent = indent; - if (match || entire_thread) { + if (match || params->entire_thread) { show_message (ctx, format, message, indent); next_indent = indent + 1; fputs (format->message_set_sep, stdout); } - show_messages (ctx, format, notmuch_message_get_replies (message), - next_indent, entire_thread); + show_messages (ctx, + format, + notmuch_message_get_replies (message), + next_indent, + params); notmuch_message_destroy (message); @@ -567,16 +565,15 @@ show_messages (void *ctx, fputs (format->message_set_end, stdout); } -/* Support for --format=raw */ +/* Formatted output of single message */ static int -do_show_raw (unused(void *ctx), notmuch_query_t *query) +do_show_single (void *ctx, + notmuch_query_t *query, + const notmuch_show_format_t *format, + notmuch_show_params_t *params) { notmuch_messages_t *messages; notmuch_message_t *message; - const char *filename; - FILE *file; - size_t size; - char buf[4096]; if (notmuch_query_count_messages (query) != 1) { fprintf (stderr, "Error: search term did not match precisely one message.\n"); @@ -591,34 +588,44 @@ do_show_raw (unused(void *ctx), notmuch_query_t *query) return 1; } - filename = notmuch_message_get_filename (message); - if (filename == NULL) { - fprintf (stderr, "Error: Cannot message filename.\n"); - return 1; - } + /* Special case for --format=raw of full single message, just cat out file */ + if (params->raw) { - file = fopen (filename, "r"); - if (file == NULL) { - fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno)); - return 1; - } + const char *filename; + FILE *file; + size_t size; + char buf[4096]; - while (!feof (file)) { - size = fread (buf, 1, sizeof (buf), file); - fwrite (buf, size, 1, stdout); - } + filename = notmuch_message_get_filename (message); + if (filename == NULL) { + fprintf (stderr, "Error: Cannot message filename.\n"); + return 1; + } - fclose (file); + file = fopen (filename, "r"); + if (file == NULL) { + fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno)); + return 1; + } + + while (!feof (file)) { + size = fread (buf, 1, sizeof (buf), file); + fwrite (buf, size, 1, stdout); + } + + fclose (file); + + } return 0; } -/* Support for --format=text|json|mbox */ +/* Formatted output of threads */ static int do_show (void *ctx, notmuch_query_t *query, const notmuch_show_format_t *format, - int entire_thread) + notmuch_show_params_t *params) { notmuch_threads_t *threads; notmuch_thread_t *thread; @@ -643,7 +650,7 @@ do_show (void *ctx, fputs (format->message_set_sep, stdout); first_toplevel = 0; - show_messages (ctx, format, messages, 0, entire_thread); + show_messages (ctx, format, messages, 0, params); notmuch_thread_destroy (thread); @@ -663,9 +670,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) char *query_string; char *opt; const notmuch_show_format_t *format = &format_text; - int entire_thread = 0; + notmuch_show_params_t params; int i; - int raw = 0; + + params.entire_thread = 0; + params.raw = 0; for (i = 0; i < argc && argv[i][0] == '-'; i++) { if (strcmp (argv[i], "--") == 0) { @@ -678,17 +687,17 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) format = &format_text; } else if (strcmp (opt, "json") == 0) { format = &format_json; - entire_thread = 1; + params.entire_thread = 1; } else if (strcmp (opt, "mbox") == 0) { format = &format_mbox; } else if (strcmp (opt, "raw") == 0) { - raw = 1; + params.raw = 1; } else { fprintf (stderr, "Invalid value for --format: %s\n", opt); return 1; } } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { - entire_thread = 1; + params.entire_thread = 1; } else { fprintf (stderr, "Unrecognized option: %s\n", argv[i]); return 1; @@ -724,10 +733,12 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } - if (raw) - return do_show_raw (ctx, query); + /* If --format=raw specified without specifying part, we can only + * output single message, so set part=0 */ + if (params.raw) + return do_show_single (ctx, query, format, ¶ms); else - return do_show (ctx, query, format, entire_thread); + return do_show (ctx, query, format, ¶ms); notmuch_query_destroy (query); notmuch_database_close (notmuch);