From 4029ae2e26d7dbc2409b1c886011da26bfcca1c8 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 6 Aug 2016 22:52:30 +0900 Subject: [PATCH] v3 of message properties patches --- df/3bd289b08aee96ea43f212d60cfac11e90e2cc | 151 ++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 df/3bd289b08aee96ea43f212d60cfac11e90e2cc diff --git a/df/3bd289b08aee96ea43f212d60cfac11e90e2cc b/df/3bd289b08aee96ea43f212d60cfac11e90e2cc new file mode 100644 index 000000000..935ad3250 --- /dev/null +++ b/df/3bd289b08aee96ea43f212d60cfac11e90e2cc @@ -0,0 +1,151 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 6ACF86DE02B5 + for ; Sat, 6 Aug 2016 06:52:59 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.652 +X-Spam-Level: +X-Spam-Status: No, score=0.652 tagged_above=-999 required=5 tests=[AWL=-0.662, + HEADER_FROM_DIFFERENT_DOMAINS=0.001, URI_HEX=1.313] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id uDEg8hXBA5n7 for ; + Sat, 6 Aug 2016 06:52:51 -0700 (PDT) +Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) + by arlo.cworth.org (Postfix) with ESMTPS id D88526DE00DF + for ; Sat, 6 Aug 2016 06:52:50 -0700 (PDT) +Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) + (envelope-from ) id 1bW22B-0007DZ-LX + for notmuch@notmuchmail.org; Sat, 06 Aug 2016 09:53:03 -0400 +Received: (nullmailer pid 4122 invoked by uid 1000); + Sat, 06 Aug 2016 13:52:44 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: v3 of message properties patches +Date: Sat, 6 Aug 2016 22:52:30 +0900 +Message-Id: <1470491559-3946-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.8.1 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Sat, 06 Aug 2016 13:52:59 -0000 + +This obsoletes + + id:1470184228-12517-1-git-send-email-david@tethera.net + +In particular it fixes the compile errors (boo), and adds dkg's +has: queries, with minimal doc and tests. + +interdiff follows: + +diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst +index 075f88c..86d02ee 100644 +--- a/doc/man7/notmuch-search-terms.rst ++++ b/doc/man7/notmuch-search-terms.rst +@@ -58,6 +58,8 @@ indicate user-supplied values): + + - query: + ++- has:= ++ + The **from:** prefix is used to match the name or address of the sender + of an email message. + +@@ -139,6 +141,11 @@ queries added with **notmuch-config(1)**. Named queries are only + available if notmuch is built with **Xapian Field Processors** (see + below). + ++The **has:** prefix searches for messages with a particular ++= property pair. Properties are used internally by notmuch ++(and extensions) to add metadata to messages. A given key can be ++present on a given message with several different values. ++ + Operators + --------- + +@@ -217,7 +224,7 @@ exact matches like "tag:inbox" or **probabilistic**, supporting a more flexible + + + Boolean +- **tag:**, **id:**, **thread:**, **folder:**, **path:** ++ **tag:**, **id:**, **thread:**, **folder:**, **path:**, **has** + Probabilistic + **from:**, **to:**, **subject:**, **attachment:**, **mimetype:** + +diff --git a/lib/database.cc b/lib/database.cc +index 3a741f0..3bdbd07 100644 +--- a/lib/database.cc ++++ b/lib/database.cc +@@ -97,6 +97,9 @@ typedef struct { + * STRING is the name of a file within that + * directory for this mail message. + * ++ * has: Has a property with key=value ++ * FIXME: if no = is present, should match on any value ++ * + * A mail document also has four values: + * + * TIMESTAMP: The time_t value corresponding to the message's +@@ -260,6 +263,7 @@ static prefix_t BOOLEAN_PREFIX_EXTERNAL[] = { + { "is", "K" }, + { "id", "Q" }, + { "path", "P" }, ++ { "has", "XPROPERTY" }, + /* + * Without the ":", since this is a multi-letter prefix, Xapian + * will add a colon itself if the first letter of the path is +diff --git a/notmuch-restore.c b/notmuch-restore.c +index 3cd8a40..d6429ef 100644 +--- a/notmuch-restore.c ++++ b/notmuch-restore.c +@@ -83,7 +83,7 @@ process_properties_line (notmuch_database_t *notmuch, const char* line) + goto DONE; + + if (print_status_database ("notmuch restore", notmuch, +- notmuch_message_remove_all_properties (message))) ++ notmuch_message_remove_all_properties (message, NULL))) + goto DONE; + + tok = id_p + id_len; +diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh +index 8952eb7..ee7910b 100755 +--- a/test/T610-message-property.sh ++++ b/test/T610-message-property.sh +@@ -91,7 +91,7 @@ test_expect_equal_file EXPECTED OUTPUT + + test_begin_subtest "notmuch_message_remove_all_properties" + cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} +-EXPECT0(notmuch_message_remove_all_properties (message)); ++EXPECT0(notmuch_message_remove_all_properties (message, NULL)); + print_properties (message, "", FALSE); + EOF + cat <<'EOF' >EXPECTED +@@ -237,4 +237,15 @@ notmuch restore < BEFORE2 + notmuch dump | grep '^#=' > OUTPUT + test_expect_equal_file PROPERTIES OUTPUT + ++test_begin_subtest "test 'has:' queries: empty" ++notmuch search has:testkey1=charles > OUTPUT ++test_expect_equal_file /dev/null OUTPUT ++ ++test_begin_subtest "test 'has:' queries: single message" ++notmuch search --output=messages has:testkey1=alice > OUTPUT ++cat <EXPECTED ++id:4EFC743A.3060609@april.org ++EOF ++test_expect_equal_file EXPECTED OUTPUT ++ + test_done -- 2.26.2