From: tomi.ollila@iki.fi
To: notmuch@notmuchmail.org
Cc: Tomi Ollila <tomi.ollila@iki.fi>
Subject: [PATCH 3/3] added support for user-specified directories to exclude
Date: Wed, 14 Sep 2011 00:32:04 +0300 [thread overview]
Message-ID: <1315949524-4948-4-git-send-email-tomi.ollila@iki.fi> (raw)
In-Reply-To: <1315949524-4948-1-git-send-email-tomi.ollila@iki.fi>
From: Tomi Ollila <tomi.ollila@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
next prev parent reply other threads:[~2011-09-13 21:32 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-13 21:32 [PATCH 0/3] Configuration file option to exclude files/directories tomi.ollila
2011-09-13 21:32 ` [PATCH 1/3] added function notmuch_talloc_g_key_file_get_string_list() tomi.ollila
2011-09-13 21:32 ` [PATCH 2/3] Made notmuch_config_get_new_tags() use notmuch_talloc_g_key_file_get_string_list() tomi.ollila
2011-09-13 21:32 ` tomi.ollila [this message]
2011-12-07 23:51 ` [PATCH 0/3] Configuration file option to exclude files/directories David Bremner
2011-12-08 0:24 ` Tom Prince
2011-12-08 9:05 ` Tomi Ollila
2012-01-25 0:46 ` Pieter Praet
2012-01-26 10:11 ` [PATCH 1/2] moved _notmuch_get_list () and _notmuch_set_list () up in file Tomi Ollila
2012-01-26 10:11 ` [PATCH 2/2] added support for user-specified directories to exclude Tomi Ollila
2012-01-26 13:11 ` Jani Nikula
2012-01-27 10:41 ` Tomi Ollila
2012-01-27 22:14 ` Austin Clements
2012-01-28 14:16 ` Fabio Zanini
2012-01-27 22:50 ` Austin Clements
2012-01-26 13:03 ` [PATCH 1/2] moved _notmuch_get_list () and _notmuch_set_list () up in file Jani Nikula
2012-01-27 10:42 ` Tomi Ollila
2012-01-27 18:18 ` Ethan Glasser-Camp
2012-01-30 10:31 ` [PATCH] moved _config_(get|set)_list () functions earlyer in the file Tomi Ollila
2012-01-30 15:06 ` Austin Clements
2012-01-31 3:28 ` David Bremner
2012-01-27 10:59 ` [PATCH] moved _notmuch_(get|set)_list " Tomi Ollila
2012-01-27 22:15 ` Austin Clements
2012-01-25 6:28 ` [PATCH 0/3] Configuration file option to exclude files/directories David Edmondson
2012-02-01 14:12 ` [PATCH] test: add tests wrt ignoring user-specified files and directories Pieter Praet
2012-02-03 12:14 ` Tomi Ollila
2012-02-03 22:39 ` Austin Clements
2012-02-03 22:44 ` Austin Clements
2012-02-19 20:43 ` Pieter Praet
2012-01-31 16:28 ` [PATCH] added support for user-specified files & directories to ignore Tomi Ollila
2012-02-01 14:25 ` Pieter Praet
2012-02-01 14:49 ` Jani Nikula
2012-02-01 16:30 ` Austin Clements
2012-02-06 9:28 ` [PATCH v6 1/3] test: add tests wrt ignoring user-specified files and directories Tomi Ollila
2012-02-06 9:28 ` [PATCH v6 2/3] add support for user-specified files & directories to ignore Tomi Ollila
2012-02-06 9:50 ` Tomi Ollila
2012-02-06 9:28 ` [PATCH v6 3/3] NEWS: add news section for new.ignore Tomi Ollila
2012-02-14 19:18 ` Austin Clements
2012-02-13 8:20 ` [PATCH v6 1/3] test: add tests wrt ignoring user-specified files and directories Tomi Ollila
2012-02-14 19:20 ` Austin Clements
2012-02-14 19:18 ` Austin Clements
2012-02-15 9:17 ` [PATCH v7 0/3] NEWS and test comment adjustments Tomi Ollila
2012-02-15 9:17 ` [PATCH v7 1/3] test: add tests wrt ignoring user-specified files and directories Tomi Ollila
2012-02-15 9:17 ` [PATCH v7 2/3] add support for user-specified files & directories to ignore Tomi Ollila
2012-02-15 9:17 ` [PATCH v7 3/3] NEWS: add news section for new.ignore Tomi Ollila
2012-02-17 12:13 ` [PATCH v7 0/3] NEWS and test comment adjustments David Bremner
2012-02-19 20:47 ` Pieter Praet
2012-02-19 20:47 ` [PATCH 1/6] cli: update 'new.ignore' config file comment wrt file/directory matching Pieter Praet
2012-02-28 2:46 ` David Bremner
2012-02-19 20:47 ` [PATCH 2/6] NEWS: sync 'new.ignore' entry with its comment in notmuch-config.c Pieter Praet
2012-02-28 2:46 ` David Bremner
2012-02-19 20:47 ` [PATCH 3/6] cli: add '--debug' option to 'notmuch new' Pieter Praet
2012-02-19 20:47 ` [PATCH 4/6] cli: notmuch new: optionally output debug information when ignoring files/directories Pieter Praet
2012-02-19 20:47 ` [PATCH 5/6] test-lib.sh: pass 'NOTMUCH_NEW's args down to 'notmuch new' Pieter Praet
2012-02-19 20:47 ` [PATCH 6/6] test: another test wrt ignoring user-specified files and directories Pieter Praet
2012-08-31 21:13 ` David Bremner
2012-10-12 19:32 ` [PATCH] " Ethan Glasser-Camp
2012-10-20 20:42 ` David Bremner
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=1315949524-4948-4-git-send-email-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--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).