From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH v5 04/12] properties: add notmuch_message_remove_all_properties_with_prefix()
Date: Sun, 15 Oct 2017 02:47:59 -0400 [thread overview]
Message-ID: <20171015064807.14205-5-dkg@fifthhorseman.net> (raw)
In-Reply-To: <20171015064807.14205-1-dkg@fifthhorseman.net>
Subsequent patches will introduce a convention that properties whose
name starts with "index." will be stripped (and possibly re-added)
during re-indexing. This patch lays the groundwork for doing that.
---
lib/message-property.cc | 18 ++++++++++++++++--
lib/notmuch.h | 16 ++++++++++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/lib/message-property.cc b/lib/message-property.cc
index d72c74c3..35eaf3c6 100644
--- a/lib/message-property.cc
+++ b/lib/message-property.cc
@@ -85,8 +85,9 @@ notmuch_message_remove_property (notmuch_message_t *message, const char *key, co
return _notmuch_message_modify_property (message, key, value, true);
}
+static
notmuch_status_t
-notmuch_message_remove_all_properties (notmuch_message_t *message, const char *key)
+_notmuch_message_remove_all_properties (notmuch_message_t *message, const char *key, bool prefix)
{
notmuch_status_t status;
const char * term_prefix;
@@ -97,7 +98,8 @@ notmuch_message_remove_all_properties (notmuch_message_t *message, const char *k
_notmuch_message_invalidate_metadata (message, "property");
if (key)
- term_prefix = talloc_asprintf (message, "%s%s=", _find_prefix ("property"), key);
+ term_prefix = talloc_asprintf (message, "%s%s%s", _find_prefix ("property"), key,
+ prefix ? "" : "=");
else
term_prefix = _find_prefix ("property");
@@ -107,6 +109,18 @@ notmuch_message_remove_all_properties (notmuch_message_t *message, const char *k
return NOTMUCH_STATUS_SUCCESS;
}
+notmuch_status_t
+notmuch_message_remove_all_properties (notmuch_message_t *message, const char *key)
+{
+ return _notmuch_message_remove_all_properties (message, key, false);
+}
+
+notmuch_status_t
+notmuch_message_remove_all_properties_with_prefix (notmuch_message_t *message, const char *prefix)
+{
+ return _notmuch_message_remove_all_properties (message, prefix, true);
+}
+
notmuch_message_properties_t *
notmuch_message_get_properties (notmuch_message_t *message, const char *key, notmuch_bool_t exact)
{
diff --git a/lib/notmuch.h b/lib/notmuch.h
index 0b2e8305..817f357f 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1824,6 +1824,22 @@ notmuch_message_remove_property (notmuch_message_t *message, const char *key, co
notmuch_status_t
notmuch_message_remove_all_properties (notmuch_message_t *message, const char *key);
+/**
+ * Remove all (prefix*,value) pairs from the given message
+ *
+ * @param[in,out] message message to operate on.
+ * @param[in] prefix delete properties with keys that start with prefix.
+ * If NULL, delete all properties
+ * @returns
+ * - NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in
+ * read-only mode so message cannot be modified.
+ * - NOTMUCH_STATUS_SUCCESS: No error occured.
+ *
+ * @since libnotmuch 5.1 (notmuch 0.26)
+ */
+notmuch_status_t
+notmuch_message_remove_all_properties_with_prefix (notmuch_message_t *message, const char *prefix);
+
/**
* Opaque message property iterator
*/
--
2.14.2
next prev parent reply other threads:[~2017-10-15 6:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-15 6:47 cleartext indexing version 5 Daniel Kahn Gillmor
2017-10-15 6:47 ` [PATCH v5 01/12] crypto: move into libnotmuch_util Daniel Kahn Gillmor
2017-10-15 6:47 ` [PATCH v5 02/12] crypto: make shared crypto code behave library-like Daniel Kahn Gillmor
2017-10-15 6:47 ` [PATCH v5 03/12] index: implement notmuch_indexopts_t with try_decrypt Daniel Kahn Gillmor
2017-10-15 6:47 ` Daniel Kahn Gillmor [this message]
2017-10-15 6:48 ` [PATCH v5 05/12] reindex: drop all properties named with prefix "index." Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 06/12] crypto: index encrypted parts when indexopts try_decrypt is set Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 07/12] config: indexing defaults will be stored in the database Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 08/12] config: define new option index.try_decrypt Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 09/12] cli: set up shared command-line arguments for indexing Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 10/12] cli/new: add --try-decrypt=(true|false) Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 11/12] cli/insert: " Daniel Kahn Gillmor
2017-10-15 6:48 ` [PATCH v5 12/12] cli/reindex: " Daniel Kahn Gillmor
2017-10-17 1:40 ` cleartext indexing version 5 Jameson Graef Rollins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171015064807.14205-5-dkg@fifthhorseman.net \
--to=dkg@fifthhorseman.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).