X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-show.c;h=c3c42caac52c06bf5113863983b80c44789d9e8e;hb=4c79a2dabe38ac72eb9eb21620f2ffca5f1885c6;hp=3626504309bf110bf581f9e895d434d5eaa46a5d;hpb=f12fb4d819956cb467b22183f0416fed44703d0f;p=notmuch diff --git a/notmuch-show.c b/notmuch-show.c index 36265043..c3c42caa 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -80,6 +80,18 @@ _get_disposition (GMimeObject *meta) return g_mime_content_disposition_get_disposition (disposition); } +static bool _get_message_flag (notmuch_message_t *message, notmuch_message_flag_t flag) { + notmuch_bool_t is_set; + notmuch_status_t status; + + status = notmuch_message_get_flag_st (message, flag, &is_set); + + if (print_status_message ("notmuch show", message, status)) + INTERNAL_ERROR("unexpected error getting message flag\n"); + + return is_set; +} + /* Emit a sequence of key/value pairs for the metadata of message. * The caller should begin a map before calling this. */ static void @@ -97,10 +109,10 @@ format_message_sprinter (sprinter_t *sp, notmuch_message_t *message) sp->string (sp, notmuch_message_get_message_id (message)); sp->map_key (sp, "match"); - sp->boolean (sp, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH)); + sp->boolean (sp, _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH)); sp->map_key (sp, "excluded"); - sp->boolean (sp, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED)); + sp->boolean (sp, _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED)); sp->map_key (sp, "filename"); if (notmuch_format_version >= 3) { @@ -507,8 +519,8 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node, part_type, notmuch_message_get_message_id (message), indent, - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0, - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0, + _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0, + _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0, notmuch_message_get_filename (message)); } else { char *content_string; @@ -897,7 +909,7 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp), } if (ssize > 0 && fwrite (buf, ssize, 1, stdout) != 1) { - fprintf (stderr, "Error: Write %ld chars to stdout failed\n", ssize); + fprintf (stderr, "Error: Write %zd chars to stdout failed\n", ssize); goto DONE; } } @@ -1002,8 +1014,8 @@ show_messages (void *ctx, message = notmuch_messages_get (messages); - match = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH); - excluded = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); + match = _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH); + excluded = _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); next_indent = indent; @@ -1143,7 +1155,7 @@ do_show_unthreaded (void *ctx, message = notmuch_messages_get (messages); notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, TRUE); - excluded = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); + excluded = _get_message_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); if (!excluded || !params->omit_excluded) { status = show_message (ctx, format, sp, message, 0, params); @@ -1203,7 +1215,7 @@ static const notmuch_show_format_t *formatters[] = { }; int -notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) +notmuch_show_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[]) { notmuch_database_t *notmuch; notmuch_query_t *query; @@ -1222,6 +1234,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) bool entire_thread_set = false; bool single_message; bool unthreaded = FALSE; + char *status_string = NULL; notmuch_opt_desc_t options[] = { { .opt_keyword = &format, .name = "format", .keywords = @@ -1311,7 +1324,28 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) fprintf (stderr, "Warning: --include-html only implemented for format=text, format=json and format=sexp\n"); } - query_string = query_string_from_args (config, argc - opt_index, argv + opt_index); + notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY; + if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) + mode = NOTMUCH_DATABASE_MODE_READ_WRITE; + if (notmuch_database_open_with_config (NULL, + mode, + _notmuch_config_get_path (config), + NULL, + ¬much, + &status_string)) { + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + + return EXIT_FAILURE; + } + + config = NULL; + + notmuch_exit_if_unmatched_db_uuid (notmuch); + + query_string = query_string_from_args (notmuch, argc - opt_index, argv + opt_index); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; @@ -1322,15 +1356,6 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } - notmuch_database_mode_t mode = NOTMUCH_DATABASE_MODE_READ_ONLY; - if (params.crypto.decrypt == NOTMUCH_DECRYPT_TRUE) - mode = NOTMUCH_DATABASE_MODE_READ_WRITE; - if (notmuch_database_open (notmuch_config_get_database_path (config), - mode, ¬much)) - return EXIT_FAILURE; - - notmuch_exit_if_unmatched_db_uuid (notmuch); - query = notmuch_query_create (notmuch, query_string); if (query == NULL) { fprintf (stderr, "Out of memory\n"); @@ -1339,27 +1364,26 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) /* Create structure printer. */ formatter = formatters[format]; - sprinter = formatter->new_sprinter (config, stdout); + sprinter = formatter->new_sprinter (notmuch, stdout); params.out_stream = g_mime_stream_stdout_new (); /* If a single message is requested we do not use search_excludes. */ if (single_message) { - ret = do_show_single (config, query, formatter, sprinter, ¶ms); + ret = do_show_single (notmuch, query, formatter, sprinter, ¶ms); } else { /* We always apply set the exclude flag. The * exclude=true|false option controls whether or not we return * threads that only match in an excluded message */ - const char **search_exclude_tags; - size_t search_exclude_tags_length; - unsigned int i; + notmuch_config_values_t *exclude_tags; notmuch_status_t status; - search_exclude_tags = notmuch_config_get_search_exclude_tags - (config, &search_exclude_tags_length); + for (exclude_tags = notmuch_config_get_values (notmuch, NOTMUCH_CONFIG_EXCLUDE_TAGS); + notmuch_config_values_valid (exclude_tags); + notmuch_config_values_move_to_next (exclude_tags)) { - for (i = 0; i < search_exclude_tags_length; i++) { - status = notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); + status = notmuch_query_add_tag_exclude (query, + notmuch_config_values_get (exclude_tags)); if (status && status != NOTMUCH_STATUS_IGNORED) { print_status_query ("notmuch show", query, status); ret = -1; @@ -1373,9 +1397,9 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) } if (unthreaded) - ret = do_show_unthreaded (config, query, formatter, sprinter, ¶ms); + ret = do_show_unthreaded (notmuch, query, formatter, sprinter, ¶ms); else - ret = do_show_threaded (config, query, formatter, sprinter, ¶ms); + ret = do_show_threaded (notmuch, query, formatter, sprinter, ¶ms); } DONE: