X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=65c780e7b8681716c85a1b11e990ffbfd40d6dfb;hp=27587f8799291d79e5a47342beb7bea3226202fc;hb=1a8aae6fa7be108819fa848df3dc98e1840f5eba;hpb=5a9d5f2f149b4c3122e2796e782c13a32571696b diff --git a/notmuch-show.c b/notmuch-show.c index 27587f87..65c780e7 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -82,6 +82,19 @@ static const notmuch_show_format_t format_mbox = { "" }; +static void +format_part_raw (GMimeObject *part, + unused (int *part_count)); + +static const notmuch_show_format_t format_raw = { + "", + "", NULL, + "", NULL, "", + "", format_part_raw, NULL, "", "", + "", "", + "" +}; + static const char * _get_tags_as_string (const void *ctx, notmuch_message_t *message) { @@ -329,6 +342,10 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out) GMimeDataWrapper *wrapper; const char *charset; + /* do nothing if this is a multipart */ + if (GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part)) + return; + charset = g_mime_object_get_content_type_parameter (part, "charset"); if (stream_out) { @@ -399,7 +416,8 @@ format_part_text (GMimeObject *part, int *part_count) show_part_content (part, stream_stdout); g_object_unref(stream_stdout); } - else if (g_mime_content_type_is_type (content_type, "multipart", "*")) + else if (g_mime_content_type_is_type (content_type, "multipart", "*") || + g_mime_content_type_is_type (content_type, "message", "rfc822")) { /* Do nothing for multipart since its content will be printed * when recursing. */ @@ -466,7 +484,8 @@ format_part_json (GMimeObject *part, int *part_count) printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len)); } - else if (g_mime_content_type_is_type (content_type, "multipart", "*")) + else if (g_mime_content_type_is_type (content_type, "multipart", "*") || + g_mime_content_type_is_type (content_type, "message", "rfc822")) { printf (", \"content\": ["); } @@ -483,36 +502,52 @@ format_part_end_json (GMimeObject *part) content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); - if (g_mime_content_type_is_type (content_type, "multipart", "*")) + if (g_mime_content_type_is_type (content_type, "multipart", "*") || + g_mime_content_type_is_type (content_type, "message", "rfc822")) printf ("]"); printf ("}"); } +static void +format_part_raw (GMimeObject *part, unused (int *part_count)) +{ + GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); + g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); + show_part_content (part, stream_stdout); + g_object_unref(stream_stdout); +} + static void show_message (void *ctx, const notmuch_show_format_t *format, notmuch_message_t *message, - int indent) + int indent, + notmuch_show_params_t *params) { - fputs (format->message_start, stdout); - if (format->message) - format->message(ctx, message, indent); + if (params->part <= 0) { + fputs (format->message_start, stdout); + if (format->message) + format->message(ctx, message, indent); + + fputs (format->header_start, stdout); + if (format->header) + format->header(ctx, message); + fputs (format->header_end, stdout); - fputs (format->header_start, stdout); - if (format->header) - format->header(ctx, message); - fputs (format->header_end, stdout); + fputs (format->body_start, stdout); + } - fputs (format->body_start, stdout); if (format->part) show_message_body (notmuch_message_get_filename (message), - format); - fputs (format->body_end, stdout); + format, params); - fputs (format->message_end, stdout); -} + if (params->part <= 0) { + fputs (format->body_end, stdout); + fputs (format->message_end, stdout); + } +} static void show_messages (void *ctx, @@ -545,7 +580,7 @@ show_messages (void *ctx, next_indent = indent; if (match || params->entire_thread) { - show_message (ctx, format, message, indent); + show_message (ctx, format, message, indent, params); next_indent = indent + 1; fputs (format->message_set_sep, stdout); @@ -588,8 +623,10 @@ do_show_single (void *ctx, return 1; } + notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1); + /* Special case for --format=raw of full single message, just cat out file */ - if (params->raw) { + if (params->raw && 0 == params->part) { const char *filename; FILE *file; @@ -615,6 +652,10 @@ do_show_single (void *ctx, fclose (file); + } else { + + show_message (ctx, format, message, 0, params); + } return 0; @@ -671,10 +712,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) char *opt; const notmuch_show_format_t *format = &format_text; notmuch_show_params_t params; + int mbox = 0; + int format_specified = 0; int i; params.entire_thread = 0; params.raw = 0; + params.part = -1; for (i = 0; i < argc && argv[i][0] == '-'; i++) { if (strcmp (argv[i], "--") == 0) { @@ -690,12 +734,17 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) params.entire_thread = 1; } else if (strcmp (opt, "mbox") == 0) { format = &format_mbox; + mbox = 1; } else if (strcmp (opt, "raw") == 0) { + format = &format_raw; params.raw = 1; } else { fprintf (stderr, "Invalid value for --format: %s\n", opt); return 1; } + format_specified = 1; + } else if (STRNCMP_LITERAL (argv[i], "--part=") == 0) { + params.part = atoi(argv[i] + sizeof ("--part=") - 1); } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { params.entire_thread = 1; } else { @@ -717,6 +766,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } + if (mbox && params.part > 0) { + fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n"); + return 1; + } + if (*query_string == '\0') { fprintf (stderr, "Error: notmuch show requires at least one search term.\n"); return 1; @@ -733,9 +787,16 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } + /* if part was requested and format was not specified, use format=raw */ + if (params.part >= 0 && !format_specified) + format = &format_raw; + /* If --format=raw specified without specifying part, we can only * output single message, so set part=0 */ - if (params.raw) + if (params.raw && params.part < 0) + params.part = 0; + + if (params.part >= 0) return do_show_single (ctx, query, format, ¶ms); else return do_show (ctx, query, format, ¶ms); @@ -745,78 +806,3 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 0; } - -int -notmuch_part_command (void *ctx, unused (int argc), unused (char *argv[])) -{ - notmuch_config_t *config; - notmuch_database_t *notmuch; - notmuch_query_t *query; - notmuch_messages_t *messages; - notmuch_message_t *message; - char *query_string; - int i; - int part = 0; - - for (i = 0; i < argc && argv[i][0] == '-'; i++) { - if (strcmp (argv[i], "--") == 0) { - i++; - break; - } - if (STRNCMP_LITERAL (argv[i], "--part=") == 0) { - part = atoi(argv[i] + sizeof ("--part=") - 1); - } else { - fprintf (stderr, "Unrecognized option: %s\n", argv[i]); - return 1; - } - } - - argc -= i; - argv += i; - - config = notmuch_config_open (ctx, NULL, NULL); - if (config == NULL) - return 1; - - query_string = query_string_from_args (ctx, argc, argv); - if (query_string == NULL) { - fprintf (stderr, "Out of memory\n"); - return 1; - } - - if (*query_string == '\0') { - fprintf (stderr, "Error: notmuch part requires at least one search term.\n"); - return 1; - } - - notmuch = notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY); - if (notmuch == NULL) - return 1; - - query = notmuch_query_create (notmuch, query_string); - if (query == NULL) { - fprintf (stderr, "Out of memory\n"); - return 1; - } - - if (notmuch_query_count_messages (query) != 1) { - fprintf (stderr, "Error: search term did not match precisely one message.\n"); - return 1; - } - - messages = notmuch_query_search_messages (query); - message = notmuch_messages_get (messages); - - if (message == NULL) { - fprintf (stderr, "Error: cannot find matching message.\n"); - return 1; - } - - show_one_part (notmuch_message_get_filename (message), part); - - notmuch_query_destroy (query); - notmuch_database_close (notmuch); - - return 0; -}