From: Tomi Ollila <tomi.oll...@iki.fi>
A new configuration key 'database.exclude' is used to determine
which directories user wants not to be scanned for new mails.
---
notmuch-client.h | 3 +++
notmuch-config.c | 19 +++++++++++++++++++
notmuch-new.c | 22 ++++++++++++++++++++--
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index b50cb38..503ac79 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -197,6 +197,9 @@ void
notmuch_config_set_database_path (notmuch_config_t *config,
const char *database_path);
+const char **
+notmuch_config_get_database_exclude (notmuch_config_t *config,
+ size_t *length);
const char *
notmuch_config_get_user_name (notmuch_config_t *config);
diff --git a/notmuch-config.c b/notmuch-config.c
index 648639b..b628074 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -88,6 +88,8 @@ struct _notmuch_config {
GKeyFile *key_file;
char *database_path;
+ const char **database_exclude;
+ size_t database_exclude_length;
char *user_name;
char *user_primary_email;
const char **user_other_email;
@@ -282,6 +284,8 @@ notmuch_config_open (void *ctx,
config->key_file = g_key_file_new ();
config->database_path = NULL;
+ config->database_exclude = NULL;
+ config->database_exclude_length = 0;
config->user_name = NULL;
config->user_primary_email = NULL;
config->user_other_email = NULL;
@@ -502,6 +506,21 @@ notmuch_config_set_database_path (notmuch_config_t *config,
config->database_path = NULL;
}
+const char **
+notmuch_config_get_database_exclude (notmuch_config_t *config,
+ size_t *length)
+{
+ if (config->database_exclude == NULL) {
+ config->database_exclude = notmuch_talloc_g_key_file_get_string_list(
+ config,
+ config->key_file,
+ "database", "exclude",
+ &config->database_exclude_length, NULL);
+ }
+ *length = config->database_exclude_length;
+ return config->database_exclude;
+}
+
const char *
notmuch_config_get_user_name (notmuch_config_t *config)
{
diff --git a/notmuch-new.c b/notmuch-new.c
index 7d17793..36da15f 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -38,6 +38,8 @@ typedef struct {
int verbose;
const char **new_tags;
size_t new_tags_length;
+ const char **database_exclude;
+ size_t database_exclude_length;
int total_files;
int processed_files;
@@ -293,6 +295,8 @@ add_files_recursive (notmuch_database_t *notmuch,
is_maildir = _entries_resemble_maildir (fs_entries, num_fs_entries);
for (i = 0; i < num_fs_entries; i++) {
+ size_t j;
+
if (interrupted)
break;
@@ -316,8 +320,6 @@ add_files_recursive (notmuch_database_t *notmuch,
* Also ignore the .notmuch directory and any "tmp" directory
* that appears within a maildir.
*/
- /* XXX: Eventually we'll want more sophistication to let the
- * user specify files to be ignored. */
if (strcmp (entry->d_name, ".") == 0 ||
strcmp (entry->d_name, "..") == 0 ||
(is_maildir && strcmp (entry->d_name, "tmp") == 0) ||
@@ -325,6 +327,12 @@ add_files_recursive (notmuch_database_t *notmuch,
{
continue;
}
+ /* Ignore user-specified directories */
+ for (j = 0; j < state->database_exclude_length; j++)
+ if (strcmp(entry->d_name, state->database_exclude[j]) == 0)
+ break;
+ if (j < state->database_exclude_length)
+ continue;
next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
status = add_files_recursive (notmuch, next, state);
@@ -357,11 +365,20 @@ add_files_recursive (notmuch_database_t *notmuch,
/* Pass 2: Scan for new files, removed files, and removed directories. */
for (i = 0; i < num_fs_entries; i++)
{
+ size_t j;
+
if (interrupted)
break;
entry = fs_entries[i];
+ /* Ignore user-specified files & directories */
+ for (j = 0; j < state->database_exclude_length; j++)
+ if (strcmp(entry->d_name, state->database_exclude[j]) == 0)
+ break;
+ if (j < state->database_exclude_length)
+ continue;
+
/* Check if we've walked past any names in db_files or
* db_subdirs. If so, these have been deleted. */
while (notmuch_filenames_valid (db_files) &&
@@ -800,6 +817,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
return 1;
add_files_state.new_tags = notmuch_config_get_new_tags (config,
&add_files_state.new_tags_length);
+ add_files_state.database_exclude = notmuch_config_get_database_exclude
(config, &add_files_state.database_exclude_length);
add_files_state.synchronize_flags =
notmuch_config_get_maildir_synchronize_flags (config);
add_files_state.message_ids_to_sync = _filename_list_create (ctx);
db_path = notmuch_config_get_database_path (config);
--
1.7.3.4
