--- /dev/null
+Return-Path: <jani@nikula.org>\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 89274431FD9\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:01 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 dnqFO705w1Nj for <notmuch@notmuchmail.org>;\r
+ Sat, 22 Feb 2014 14:25:53 -0800 (PST)\r
+Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com\r
+ [209.85.215.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 241F0431FC3\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:53 -0800 (PST)\r
+Received: by mail-ea0-f169.google.com with SMTP id d10so1086991eaj.14\r
+ for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:51 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=vqdBISaLpPXaqODOUueqCCfr2FgpsZCLiz0uTMGL7Nc=;\r
+ b=NlE5iKvplI41WZCoUbnw84//DxfGqOFNQHitjH+CgOkkzkFG8OiiIdAtHkuDze4Pg0\r
+ YUtMKKoyDbpb3nIyC/pc+d00WBNZttVQZD6stgTbtkEd/fYygmLqrusBANgdcroNIPik\r
+ AOHSQ2z22PJvn1EkVyD9VFCW+Buflfd1pwCMO9/G45W3m4szr+Sq2Lh/VxmL58XZSXFR\r
+ UnAJ1yrgpwqjtO6P9Mue35OMSzrBxyFrJyWDXqBxvEdx5yjJaRwQCwsVpLtfLyxHuaCj\r
+ YI1w/cZaz/O5POrbt4XX9d//soLOBS9BkEz9C96U4qay1IQka6Tks6CC8hjfcYRzMPkj\r
+ +b6A==\r
+X-Gm-Message-State:\r
+ ALoCoQljb1ZXzZcYXy0dNHDSV6+IgWiCw2PddKp7cyP1tKU/VbZAxoqqQQ6prNi9c3lI9eC1+xDw\r
+X-Received: by 10.14.104.6 with SMTP id h6mr16364290eeg.29.1393107951896;\r
+ Sat, 22 Feb 2014 14:25:51 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+ k41sm43758692een.19.2014.02.22.14.25.50 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 22 Feb 2014 14:25:51 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 02/13] lib: add support for path: prefix searches\r
+Date: Sun, 23 Feb 2014 00:25:33 +0200\r
+Message-Id:\r
+ <409b48d482efd16282f696ef6e7e5053b5aa5b82.1393105055.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\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: Sat, 22 Feb 2014 22:26:01 -0000\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 f395061e3a73..93cc7f57e9db 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 7aff4ae5111a..21abe8e12b9d 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
projects / notmuch-archives.git / commitdiff