From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8Fm3EuAOJWHV5AAAgWs5BA (envelope-from ) for ; Tue, 24 Aug 2021 17:23:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iKZPDuAOJWEIZgAAbx9fmQ (envelope-from ) for ; Tue, 24 Aug 2021 15:23:12 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DB0E0896E for ; Tue, 24 Aug 2021 17:23:11 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id B50AA26BAC; Tue, 24 Aug 2021 11:21:32 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D755426A2F for ; Tue, 24 Aug 2021 11:21:27 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id D1DA45FD5C; Tue, 24 Aug 2021 11:21:27 -0400 (EDT) Received: (nullmailer pid 2942861 invoked by uid 1000); Tue, 24 Aug 2021 15:17:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 16/36] lib/parse-sexp: add '*' as syntactic sugar for '(starts-with "")' Date: Tue, 24 Aug 2021 08:17:25 -0700 Message-Id: <20210824151745.2941868-17-david@tethera.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210824151745.2941868-1-david@tethera.net> References: <20210824151745.2941868-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: HEX46KPW45JD27LCBU5DYKQCDT3MYFZ3 X-Message-ID-Hash: HEX46KPW45JD27LCBU5DYKQCDT3MYFZ3 X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629818592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ipl+Obdx4ITs7AiVFq83ZdUQEOs1mUtmJMMqcjIxmfE=; b=RVYQ/PUaGs+CFewHkhhLxUYEBGa0B6DckZ8cEWjCM3jcLqN8wwanx56S4mV8G0qZmc0piw RZZWrn9zBX1liikGniOi+/C4x270CFOEOeWAG2FKeLxsq8OyEJJcSQH0EeavRsXlZeRbVv iVx4RAqC+X7mjQ0F5M5D+yM9MCr/0imw3dkRJiTvy6K5s5norQ6FJUhLiKYyJZ6LuviIv3 isjSABJhLnPqsIub3xAlAV4raj0TmtpbLquirqZtQBaxarxIQb1JzsGcy4iUvIHseJGaGm bVrAuWXcfp9oZpOD5WKbTc8zJigxML1FGLujn/y+00i1NkTtBnnkj50xs3MTvQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629818592; a=rsa-sha256; cv=none; b=WLoKdCwsjtKOsfb2vdt2AY7vY8oh8Wv/r926zXbedYWj/bUxD9IcIn6auoPML9gbg8Kaqv V7bneNceUPFIIvcNwSa0tMblNlnNw/yAcRh5o0Ej0E/fNifWqI+FYa56BphnaPoaZQWVRN FVyyO2AthPX8QMzhGMrFn8oIU3fDtCEQqJRQE00NWzAVoE8a8eQF4K+Fk83Vv3qYsaLGU2 k8BaKxFq6FAHF2X1jqEDve/jQsjXDpA3vBfHA8jdFTjq6f7l8EhUrtT5nUounLSN4C4gdc yuaDLp7DyEyteGPUY4VjJzT12YDSsruXAzVW0+l3hxKiOgO9pew3jG66v5aaPw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.00 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: DB0E0896E X-Spam-Score: -1.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8vOrx0ZpPvUZ Users that insist on using a literal '*' as a tag, can continue to do so by quoting it when searching. --- doc/man7/notmuch-sexp-queries.rst | 19 ++++++++++-- lib/parse-sexp.cc | 5 ++++ test/T081-sexpr-search.sh | 48 +++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/doc/man7/notmuch-sexp-queries.rst b/doc/man7/notmuch-sexp-queries.rst index c83ce3d0..f32bab9c 100644 --- a/doc/man7/notmuch-sexp-queries.rst +++ b/doc/man7/notmuch-sexp-queries.rst @@ -36,8 +36,11 @@ An s-expression query is either an atom, the empty list, or a a *field*, *logical operation*, or *modifier*, and 0 or more subqueries. -``*`` ``()`` - Match all messages. +``*`` + "*" matches any non-empty string in the current field. + +``()`` + The empty list matches all messages *term* @@ -138,6 +141,15 @@ from terms, operators, and modifiers, but not other fields. MODIFIERS ````````` +*Modifiers* refer to any prefixes (first elements of compound queries) +that are neither operators nor fields. + +``(starts-with`` *subword* ``)`` + Matches any term starting with *subword*. This applies in either + phrase or term :any:`fields `, or outside of fields [#not-body]_. Note that + a ``starts-with`` query cannot be part of a phrase. The + atom ``*`` is a synonym for ``(starts-with "")``. + EXAMPLES ======== @@ -181,6 +193,9 @@ EXAMPLES "mallory@example.org", and also "bob@example.com.au" since it contains the adjacent triple "bob", "example", "com". +``(not (to *))`` + Match messages with an empty or invalid 'To' and 'Cc' field. + NOTES ===== diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 692b3849..ffb00148 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -176,6 +176,11 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent std::string term = Xapian::Unicode::tolower (sx->val); Xapian::Stem stem = *(notmuch->stemmer); std::string term_prefix = parent ? _find_prefix (parent->name) : ""; + + if (sx->aty == SEXP_BASIC && strcmp (sx->val, "*") == 0) { + return _sexp_parse_wildcard (notmuch, parent, "", output); + } + if (parent && (parent->flags & SEXP_FLAG_BOOLEAN)) { output = Xapian::Query (term_prefix + sx->val); return NOTMUCH_STATUS_SUCCESS; diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh index 24c6edd1..df502dc5 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -386,6 +386,46 @@ thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unr EOF test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest "wildcard search for 'is'" +notmuch search not id:${notag_mid} > EXPECTED +notmuch search --query=sexp '(is *)' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "negated wildcard search for 'is'" +notmuch search id:${notag_mid} > EXPECTED +notmuch search --query=sexp '(not (is *))' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "wildcard search for 'property'" +notmuch search property:foo=bar > EXPECTED +notmuch search --query=sexp '(property *)' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "wildcard search for 'tag'" +notmuch search not id:${notag_mid} > EXPECTED +notmuch search --query=sexp '(tag *)' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "negated wildcard search for 'tag'" +notmuch search id:${notag_mid} > EXPECTED +notmuch search --query=sexp '(not (tag *))' > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + +add_message '[subject]="message with tag \"*\""' +notmuch tag '+*' id:${gen_msg_id} + +test_begin_subtest "search for 'tag' \"*\"" +output=$(notmuch search --query=sexp --output=messages '(tag "*")') +test_expect_equal "$output" "id:$gen_msg_id" + +test_begin_subtest "search for missing / empty to" +add_message [to]="undisclosed-recipients:" +notmuch search --query=sexp '(not (to *))' | notmuch_search_sanitize > OUTPUT +cat < EXPECTED +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; search for missing / empty to (inbox unread) +EOF +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "Unbalanced parens" # A code 1 indicates the error was handled (a crash will return e.g. 139). test_expect_code 1 "notmuch search --query=sexp '('" @@ -454,4 +494,12 @@ notmuch search: Syntax error in query EOF test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest "wildcard, illegal field" +notmuch search --query=sexp '(body *)' >OUTPUT 2>&1 +cat < EXPECTED +notmuch search: Syntax error in query +'body' does not support wildcard queries +EOF +test_expect_equal_file EXPECTED OUTPUT + test_done -- 2.32.0