[Patch v6 05/14] lib: add support for path: prefix searches

diff --git a/5f/3297e87b2caca09e4387987a6c77453c69199a b/5f/3297e87b2caca09e4387987a6c77453c69199a
new file mode 100644 (file)
index 0000000..1ba437b
--- /dev/null
+++ b/5f/3297e87b2caca09e4387987a6c77453c69199a
@@ -0,0 +1,186 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 83798431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id NwgXMjS0Um2h for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 16:02:25 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4D8B0429E2E\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:11 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNVgY-0001v5-LN; Tue, 11 Mar 2014 20:02:10 -0300\r
+Received: (nullmailer pid 25849 invoked by uid 1000); Tue, 11 Mar 2014\r
+       23:01:46 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v6 05/14] lib: add support for path: prefix searches\r
+Date: Tue, 11 Mar 2014 20:01:31 -0300\r
+Message-Id: <1394578900-25618-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394578900-25618-1-git-send-email-david@tethera.net>\r
+References: <1394578900-25618-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 11 Mar 2014 23:02:27 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+The path: prefix is a literal boolean prefix matching the paths,\r
+relative from the maildir root, of the message files.\r
+\r
+path:foo matches all message files in foo (but not in foo/new or\r
+foo/cur).\r
+\r
+path:foo/new matches all message files in foo/new.\r
+\r
+path:"" matches all message files in the top level maildir.\r
+\r
+path:foo/** matches all message files in foo and recursively in all\r
+subdirectories of foo.\r
+\r
+path:** matches all message files recursively, i.e. all messages.\r
+---\r
+ lib/database.cc |  7 ++++---\r
+ lib/message.cc  | 52 +++++++++++++++++++++++++++++++++++++++++++++-------\r
+ 2 files changed, 49 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index f395061..93cc7f5 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -100,8 +100,8 @@ typedef struct {\r
+  * In addition, terms from the content of the message are added with\r
+  * "from", "to", "attachment", and "subject" prefixes for use by the\r
+  * user in searching. Similarly, terms from the path of the mail\r
+- * message are added with a "folder" prefix. But the database doesn't\r
+- * really care itself about any of these.\r
++ * message are added with "folder" and "path" prefixes. But the\r
++ * database doesn't really care itself about any of these.\r
+  *\r
+  * The data portion of a mail document is empty.\r
+  *\r
+@@ -208,7 +208,8 @@ static prefix_t BOOLEAN_PREFIX_EXTERNAL[] = {\r
+     { "thread",                       "G" },\r
+     { "tag",                  "K" },\r
+     { "is",                   "K" },\r
+-    { "id",                   "Q" }\r
++    { "id",                   "Q" },\r
++    { "path",                 "P" },\r
+ };\r
+ \r
+ static prefix_t PROBABILISTIC_PREFIX[]= {\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 7aff4ae..21abe8e 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -504,6 +504,40 @@ _notmuch_message_remove_terms (notmuch_message_t *message, const char *prefix)\r
+     }\r
+ }\r
+ \r
++#define RECURSIVE_SUFFIX "/**"\r
++\r
++/* Add "path:" terms for directory. */\r
++static notmuch_status_t\r
++_notmuch_message_add_path_terms (notmuch_message_t *message,\r
++                               const char *directory)\r
++{\r
++    /* Add exact "path:" term. */\r
++    _notmuch_message_add_term (message, "path", directory);\r
++\r
++    if (strlen (directory)) {\r
++      char *path, *p;\r
++\r
++      path = talloc_asprintf (NULL, "%s%s", directory, RECURSIVE_SUFFIX);\r
++      if (! path)\r
++          return NOTMUCH_STATUS_OUT_OF_MEMORY;\r
++\r
++      /* Add recursive "path:" terms for directory and all parents. */\r
++      for (p = path + strlen (path) - 1; p > path; p--) {\r
++          if (*p == '/') {\r
++              strcpy (p, RECURSIVE_SUFFIX);\r
++              _notmuch_message_add_term (message, "path", path);\r
++          }\r
++      }\r
++\r
++      talloc_free (path);\r
++    }\r
++\r
++    /* Recursive all-matching path:** for consistency. */\r
++    _notmuch_message_add_term (message, "path", "**");\r
++\r
++    return NOTMUCH_STATUS_SUCCESS;\r
++}\r
++\r
+ /* Add directory based terms for all filenames of the message. */\r
+ static notmuch_status_t\r
+ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)\r
+@@ -538,6 +572,8 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)\r
+                                                         directory_id);\r
+       if (strlen (directory))\r
+           _notmuch_message_gen_terms (message, "folder", directory);\r
++\r
++      _notmuch_message_add_path_terms (message, directory);\r
+     }\r
+ \r
+     return status;\r
+@@ -577,6 +613,8 @@ _notmuch_message_add_filename (notmuch_message_t *message,\r
+     /* New terms allow user to search with folder: specification. */\r
+     _notmuch_message_gen_terms (message, "folder", directory);\r
+ \r
++    _notmuch_message_add_path_terms (message, directory);\r
++\r
+     talloc_free (local);\r
+ \r
+     return NOTMUCH_STATUS_SUCCESS;\r
+@@ -618,18 +656,18 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
+     if (status)\r
+       return status;\r
+ \r
+-    /* Re-synchronize "folder:" terms for this message. This requires:\r
+-     *  1. removing all "folder:" terms\r
+-     *  2. removing all "folder:" stemmed terms\r
+-     *  3. adding back terms for all remaining filenames of the message. */\r
++    /* Re-synchronize "folder:" and "path:" terms for this message. */\r
+ \r
+-    /* 1. removing all "folder:" terms */\r
++    /* Remove all "folder:" terms. */\r
+     _notmuch_message_remove_terms (message, folder_prefix);\r
+ \r
+-    /* 2. removing all "folder:" stemmed terms */\r
++    /* Remove all "folder:" stemmed terms. */\r
+     _notmuch_message_remove_terms (message, zfolder_prefix);\r
+ \r
+-    /* 3. adding back terms for all remaining filenames of the message. */\r
++    /* Remove all "path:" terms. */\r
++    _notmuch_message_remove_terms (message, _find_prefix ("path"));\r
++\r
++    /* Add back terms for all remaining filenames of the message. */\r
+     status = _notmuch_message_add_directory_terms (local, message);\r
+ \r
+     talloc_free (local);\r
+-- \r
+1.8.5.3\r
+\r