From 4f06acc9420e197cd26f60a7ff225de56eb99b48 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 2 Feb 2012 17:43:36 +0000 Subject: [PATCH] [PATCH v4 08/11] cli: Make notmuch-show respect excludes. --- 75/c8fceefc7ab14e787d6ad0c087cec357f73582 | 145 ++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 75/c8fceefc7ab14e787d6ad0c087cec357f73582 diff --git a/75/c8fceefc7ab14e787d6ad0c087cec357f73582 b/75/c8fceefc7ab14e787d6ad0c087cec357f73582 new file mode 100644 index 000000000..ec65a0fdf --- /dev/null +++ b/75/c8fceefc7ab14e787d6ad0c087cec357f73582 @@ -0,0 +1,145 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0DE1F431FDB + for ; Thu, 2 Feb 2012 09:43:37 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id vPndkAPI61yO for ; + Thu, 2 Feb 2012 09:43:34 -0800 (PST) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 450AC429E26 + for ; Thu, 2 Feb 2012 09:43:13 -0800 (PST) +Received: by mail-we0-f181.google.com with SMTP id b10so2324200wer.26 + for ; Thu, 02 Feb 2012 09:43:12 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=sw+JxQaFNuQXW0Jf7pM157lQjP54/aRZ6ne3aqKuvZQ=; + b=JutaeZubeDzqgO3Rp+BqO3Tyz+XiaLbxeM3P3i20xmYSdY+ujeYR8XVtxJQnEaw+vu + QE+/H/opxhmpP++OE5ndXoDovBOe3gWeO95lWNTkFoN2YzeAHF2nGqslYNDpZVWeGeyf + LtAcJN41DoBTydCz0/Enl5tf4eAdHM7/5u7Gk= +Received: by 10.216.134.39 with SMTP id r39mr4871806wei.50.1328204592914; + Thu, 02 Feb 2012 09:43:12 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + l8sm9146585wiy.5.2012.02.02.09.43.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, + 02 Feb 2012 09:43:11 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@MIT.EDU +Subject: [PATCH v4 08/11] cli: Make notmuch-show respect excludes. +Date: Thu, 2 Feb 2012 17:43:36 +0000 +Message-Id: <1328204619-25046-8-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <874nv9rv79.fsf@qmul.ac.uk> +References: <874nv9rv79.fsf@qmul.ac.uk> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 02 Feb 2012 17:43:37 -0000 + +This adds the excludes to notmuch-show.c. We do not exclude when only +a single message (or part) is requested. notmuch-show will output the +exclude information when either text or json format is requested. As +this changes the output from notmuch-show it breaks many tests (in a +trivial and expected fashion). +--- + notmuch-show.c | 24 ++++++++++++++++++++---- + 1 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index dec799c..108f13b 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -193,10 +193,11 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) + static void + format_message_text (unused (const void *ctx), notmuch_message_t *message, int indent) + { +- printf ("id:%s depth:%d match:%d filename:%s\n", ++ printf ("id:%s depth:%d match:%d excluded:%d filename:%s\n", + notmuch_message_get_message_id (message), + indent, +- notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH), ++ notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0, ++ notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0, + notmuch_message_get_filename (message)); + } + +@@ -212,9 +213,10 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in + date = notmuch_message_get_date (message); + relative_date = notmuch_time_relative_date (ctx, date); + +- printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [", ++ printf ("\"id\": %s, \"match\": %s, \"excluded\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [", + json_quote_str (ctx_quote, notmuch_message_get_message_id (message)), + notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false", ++ notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? "true" : "false", + json_quote_str (ctx_quote, notmuch_message_get_filename (message)), + date, relative_date); + +@@ -1059,9 +1061,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; ++ const char **search_exclude_tags; ++ size_t search_exclude_tags_length; + int mbox = 0; + int format_specified = 0; + int i; ++ notmuch_bool_t no_exclude = FALSE; ++ unsigned int j; + + params.entire_thread = 0; + params.raw = 0; +@@ -1098,6 +1104,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + params.part = atoi(argv[i] + sizeof ("--part=") - 1); + } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { + params.entire_thread = 1; ++ } else if (STRNCMP_LITERAL (argv[i], "--no-exclude") == 0) { ++ no_exclude = TRUE; + } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) || + (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { + if (params.cryptoctx == NULL) { +@@ -1167,10 +1175,18 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + if (params.raw && params.part < 0) + params.part = 0; + ++ /* If a single message is requested we do not use search_excludes. */ + if (params.part >= 0) + return do_show_single (ctx, query, format, ¶ms); +- else ++ else { ++ if (!no_exclude) { ++ search_exclude_tags = notmuch_config_get_search_exclude_tags ++ (config, &search_exclude_tags_length); ++ for (j = 0; j < search_exclude_tags_length; j++) ++ notmuch_query_add_tag_exclude (query, search_exclude_tags[j]); ++ } + return do_show (ctx, query, format, ¶ms); ++ } + + notmuch_query_destroy (query); + notmuch_database_close (notmuch); +-- +1.7.2.3 + -- 2.26.2