[notmuch] [PATCH] Added mail directory filename pattern support.
On Mon, Feb 22, 2010 at 12:07:31PM -0800, Bart Massey wrote: > Typically, the filenames in a mail directory that actually > contain mail obey some specific format. For example, in my > MH email directory, all mail filenames consist only of > digits. > > This patch adds support for a config file variable > "filename_pattern" which maybe set to a regex used to filter > only valid mail filenames when scanning. Effective use of > filename_pattern cuts down on the noise from notmuch, and > may speed it up in some cases. What about the other way around? e.g. if anybody has ever pointed Evolution at a Maildir, you get a bunch of Maildir-name.ev-summary and .ev-summary-meta and .ibex.index and whatever. A default list of ignored patterns would be pretty easy to come up with. -- Stewart Smith
Re: [notmuch] [PATCH] Added mail directory filename pattern support.
In message <20100223061542.gr17...@flamingspork.com> you wrote: > On Mon, Feb 22, 2010 at 12:07:31PM -0800, Bart Massey wrote: > > Typically, the filenames in a mail directory that actually > > contain mail obey some specific format. For example, in my > > MH email directory, all mail filenames consist only of > > digits. > > > > This patch adds support for a config file variable > > "filename_pattern" which maybe set to a regex used to filter > > only valid mail filenames when scanning. Effective use of > > filename_pattern cuts down on the noise from notmuch, and > > may speed it up in some cases. > > What about the other way around? > > e.g. if anybody has ever pointed Evolution at a Maildir, you get a > bunch of Maildir-name.ev-summary and .ev-summary-meta and .ibex.index > and whatever. > > A default list of ignored patterns would be pretty easy to come up with. I'm not understanding your use case? For the most common cases, Maildir and MH, setting the appropriate filename_pattern will ignore whatever garbage is lying around the tree and just look at the mail messages. Maybe my documentation is confusing? By "filter only valid mail filenames" I mean "accept only valid mail filenames", not "filter out only valid mail filenames". :-) Thanks much for any clarification you can provide. Bart Massey b...@cs.pdx.edu ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[notmuch] [PATCH] Added mail directory filename pattern support.
In message <20100223061542.GR17878 at flamingspork.com> you wrote: > On Mon, Feb 22, 2010 at 12:07:31PM -0800, Bart Massey wrote: > > Typically, the filenames in a mail directory that actually > > contain mail obey some specific format. For example, in my > > MH email directory, all mail filenames consist only of > > digits. > > > > This patch adds support for a config file variable > > "filename_pattern" which maybe set to a regex used to filter > > only valid mail filenames when scanning. Effective use of > > filename_pattern cuts down on the noise from notmuch, and > > may speed it up in some cases. > > What about the other way around? > > e.g. if anybody has ever pointed Evolution at a Maildir, you get a > bunch of Maildir-name.ev-summary and .ev-summary-meta and .ibex.index > and whatever. > > A default list of ignored patterns would be pretty easy to come up with. I'm not understanding your use case? For the most common cases, Maildir and MH, setting the appropriate filename_pattern will ignore whatever garbage is lying around the tree and just look at the mail messages. Maybe my documentation is confusing? By "filter only valid mail filenames" I mean "accept only valid mail filenames", not "filter out only valid mail filenames". :-) Thanks much for any clarification you can provide. Bart Massey bart at cs.pdx.edu
Re: [notmuch] [PATCH] Added mail directory filename pattern support.
On Mon, Feb 22, 2010 at 12:07:31PM -0800, Bart Massey wrote: > Typically, the filenames in a mail directory that actually > contain mail obey some specific format. For example, in my > MH email directory, all mail filenames consist only of > digits. > > This patch adds support for a config file variable > "filename_pattern" which maybe set to a regex used to filter > only valid mail filenames when scanning. Effective use of > filename_pattern cuts down on the noise from notmuch, and > may speed it up in some cases. What about the other way around? e.g. if anybody has ever pointed Evolution at a Maildir, you get a bunch of Maildir-name.ev-summary and .ev-summary-meta and .ibex.index and whatever. A default list of ignored patterns would be pretty easy to come up with. -- Stewart Smith ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[notmuch] [PATCH] Added mail directory filename pattern support.
Typically, the filenames in a mail directory that actually
contain mail obey some specific format. For example, in my
MH email directory, all mail filenames consist only of
digits.
This patch adds support for a config file variable
"filename_pattern" which maybe set to a regex used to filter
only valid mail filenames when scanning. Effective use of
filename_pattern cuts down on the noise from notmuch, and
may speed it up in some cases.
Signed-off-by: Bart Massey
---
notmuch-client.h |7 +++
notmuch-config.c | 47 +--
notmuch-new.c| 35 +++
3 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index 77766de..191988c 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -146,6 +146,13 @@ notmuch_config_set_database_path (notmuch_config_t *config,
const char *database_path);
const char *
+notmuch_config_get_filename_regex (notmuch_config_t *config);
+
+void
+notmuch_config_set_filename_regex (notmuch_config_t *config,
+ const char *filename_regex);
+
+const char *
notmuch_config_get_user_name (notmuch_config_t *config);
void
diff --git a/notmuch-config.c b/notmuch-config.c
index 95430db..4189f03 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -31,11 +31,22 @@ static const char toplevel_config_comment[] =
static const char database_config_comment[] =
" Database configuration\n"
"\n"
-" The only value supported here is 'path' which should be the top-level\n"
+" The value 'path' should be the top-level\n"
" directory where your mail currently exists and to where mail will be\n"
" delivered in the future. Files should be individual email messages.\n"
" Notmuch will store its database within a sub-directory of the path\n"
-" configured here named \".notmuch\".\n";
+" configured here named \".notmuch\".\n"
+"\n"
+" The optional value 'filename_pattern' should be\n"
+" a POSIX regular expression matching only those\n"
+" filenames that will be checked for email\n"
+" messages. The match is against the last\n"
+" component of the pathname only. Anchors may be\n"
+" used, and probably should be. Typically, this\n"
+" is used to match only files whose name is a\n"
+" number ala MH, or to match only files in\n"
+" standard maildir format. The default pattern\n"
+" matches anything.\n";
static const char user_config_comment[] =
" User configuration\n"
@@ -58,6 +69,7 @@ struct _notmuch_config {
GKeyFile *key_file;
char *database_path;
+char *filename_regex;
char *user_name;
char *user_primary_email;
char **user_other_email;
@@ -151,6 +163,8 @@ get_username_from_passwd_file (void *ctx)
*
* database_path: $HOME/mail
*
+ * filename_pattern: .*
+ *
* user_name: From /etc/passwd
*
* user_primary_mail: $EMAIL variable if set, otherwise
@@ -195,6 +209,7 @@ notmuch_config_open (void *ctx,
config->key_file = g_key_file_new ();
config->database_path = NULL;
+config->filename_regex = NULL;
config->user_name = NULL;
config->user_primary_email = NULL;
config->user_other_email = NULL;
@@ -354,6 +369,34 @@ notmuch_config_set_database_path (notmuch_config_t *config,
}
const char *
+notmuch_config_get_filename_regex (notmuch_config_t *config)
+{
+char *regex;
+
+if (config->filename_regex == NULL) {
+ regex = g_key_file_get_string (config->key_file,
+ "database", "filename_pattern", NULL);
+ if (regex) {
+ config->filename_regex = talloc_strdup (config, regex);
+ free (regex);
+ }
+}
+
+return config->filename_regex;
+}
+
+void
+notmuch_config_set_filename_regex (notmuch_config_t *config,
+ const char *filename_regex)
+{
+g_key_file_set_string (config->key_file,
+ "database", "filename_pattern", filename_regex);
+
+talloc_free (config->filename_regex);
+config->filename_regex = NULL;
+}
+
+const char *
notmuch_config_get_user_name (notmuch_config_t *config)
{
char *name;
diff --git a/notmuch-new.c b/notmuch-new.c
index f25c71f..531f9a3 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -21,6 +21,8 @@
#include "notmuch-client.h"
#include
+#include
+#include
typedef struct _filename_node {
char *filename;
@@ -207,6 +209,7 @@ _entries_resemble_maildir (struct dirent **entries, int
count)
static notmuch_status_t
add_files_recursive (notmuch_database_t *notmuch,
const char *path,
+const regex_t *maybe_regex,
add_files_state_t *state)
{
DIR *dir = NULL;
@@ -302,7 +305,7 @@ add_files_recursive (notmuch_database_t *notmuch,
}
next = tallo
[notmuch] [PATCH] Added mail directory filename pattern support.
Typically, the filenames in a mail directory that actually
contain mail obey some specific format. For example, in my
MH email directory, all mail filenames consist only of
digits.
This patch adds support for a config file variable
"filename_pattern" which maybe set to a regex used to filter
only valid mail filenames when scanning. Effective use of
filename_pattern cuts down on the noise from notmuch, and
may speed it up in some cases.
Signed-off-by: Bart Massey
---
notmuch-client.h |7 +++
notmuch-config.c | 47 +--
notmuch-new.c| 35 +++
3 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index 77766de..191988c 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -146,6 +146,13 @@ notmuch_config_set_database_path (notmuch_config_t *config,
const char *database_path);
const char *
+notmuch_config_get_filename_regex (notmuch_config_t *config);
+
+void
+notmuch_config_set_filename_regex (notmuch_config_t *config,
+ const char *filename_regex);
+
+const char *
notmuch_config_get_user_name (notmuch_config_t *config);
void
diff --git a/notmuch-config.c b/notmuch-config.c
index 95430db..4189f03 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -31,11 +31,22 @@ static const char toplevel_config_comment[] =
static const char database_config_comment[] =
" Database configuration\n"
"\n"
-" The only value supported here is 'path' which should be the top-level\n"
+" The value 'path' should be the top-level\n"
" directory where your mail currently exists and to where mail will be\n"
" delivered in the future. Files should be individual email messages.\n"
" Notmuch will store its database within a sub-directory of the path\n"
-" configured here named \".notmuch\".\n";
+" configured here named \".notmuch\".\n"
+"\n"
+" The optional value 'filename_pattern' should be\n"
+" a POSIX regular expression matching only those\n"
+" filenames that will be checked for email\n"
+" messages. The match is against the last\n"
+" component of the pathname only. Anchors may be\n"
+" used, and probably should be. Typically, this\n"
+" is used to match only files whose name is a\n"
+" number ala MH, or to match only files in\n"
+" standard maildir format. The default pattern\n"
+" matches anything.\n";
static const char user_config_comment[] =
" User configuration\n"
@@ -58,6 +69,7 @@ struct _notmuch_config {
GKeyFile *key_file;
char *database_path;
+char *filename_regex;
char *user_name;
char *user_primary_email;
char **user_other_email;
@@ -151,6 +163,8 @@ get_username_from_passwd_file (void *ctx)
*
* database_path: $HOME/mail
*
+ * filename_pattern: .*
+ *
* user_name: From /etc/passwd
*
* user_primary_mail: $EMAIL variable if set, otherwise
@@ -195,6 +209,7 @@ notmuch_config_open (void *ctx,
config->key_file = g_key_file_new ();
config->database_path = NULL;
+config->filename_regex = NULL;
config->user_name = NULL;
config->user_primary_email = NULL;
config->user_other_email = NULL;
@@ -354,6 +369,34 @@ notmuch_config_set_database_path (notmuch_config_t *config,
}
const char *
+notmuch_config_get_filename_regex (notmuch_config_t *config)
+{
+char *regex;
+
+if (config->filename_regex == NULL) {
+ regex = g_key_file_get_string (config->key_file,
+ "database", "filename_pattern", NULL);
+ if (regex) {
+ config->filename_regex = talloc_strdup (config, regex);
+ free (regex);
+ }
+}
+
+return config->filename_regex;
+}
+
+void
+notmuch_config_set_filename_regex (notmuch_config_t *config,
+ const char *filename_regex)
+{
+g_key_file_set_string (config->key_file,
+ "database", "filename_pattern", filename_regex);
+
+talloc_free (config->filename_regex);
+config->filename_regex = NULL;
+}
+
+const char *
notmuch_config_get_user_name (notmuch_config_t *config)
{
char *name;
diff --git a/notmuch-new.c b/notmuch-new.c
index f25c71f..531f9a3 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -21,6 +21,8 @@
#include "notmuch-client.h"
#include
+#include
+#include
typedef struct _filename_node {
char *filename;
@@ -207,6 +209,7 @@ _entries_resemble_maildir (struct dirent **entries, int
count)
static notmuch_status_t
add_files_recursive (notmuch_database_t *notmuch,
const char *path,
+const regex_t *maybe_regex,
add_files_state_t *state)
{
DIR *dir = NULL;
@@ -302,7 +305,7 @@ add_files_recursive (notmuch_database_t *notmuch,
}
next = talloc_asprint
