This adds group [maildir] and key 'synchronize_flags' to the
configuration file. Its value enables (true) or diables (false) the
synchronization between notmuch tags and maildir flags. By default,
the synchronization is disabled.
---
lib/database-private.h | 2 +-
lib/database.cc | 9 ++++++++
lib/message.cc | 2 +-
lib/notmuch.h | 6 +++++
notmuch-client.h | 7 ++++++
notmuch-config.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
notmuch-new.c | 8 +++++-
notmuch-restore.c | 2 +
notmuch-setup.c | 10 +++++++++
notmuch-tag.c | 2 +
10 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/lib/database-private.h b/lib/database-private.h
index bd72f67..dd89c63 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -49,7 +49,7 @@ struct _notmuch_database {
Xapian::QueryParser *query_parser;
Xapian::TermGenerator *term_gen;
Xapian::ValueRangeProcessor *value_range_processor;
-
+ notmuch_bool_t maildir_sync;
};
/* Convert tags from Xapian internal format to notmuch format.
diff --git a/lib/database.cc b/lib/database.cc
index 9652013..069918a 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -689,6 +689,8 @@ notmuch_database_open (const char *path,
notmuch = NULL;
}
+ notmuch_database_set_maildir_sync (notmuch, FALSE);
+
DONE:
if (notmuch_path)
free (notmuch_path);
@@ -718,6 +720,13 @@ notmuch_database_close (notmuch_database_t *notmuch)
talloc_free (notmuch);
}
+void
+notmuch_database_set_maildir_sync (notmuch_database_t *database,
+ notmuch_bool_t maildir_sync)
+{
+ database->maildir_sync = maildir_sync;
+}
+
const char *
notmuch_database_get_path (notmuch_database_t *notmuch)
{
diff --git a/lib/message.cc b/lib/message.cc
index bb96242..80bef8e 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -626,7 +626,7 @@ _notmuch_message_sync (notmuch_message_t *message)
if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
return;
- if (// todo_sync_enabled &&
+ if (message->notmuch->maildir_sync &&
!notmuch_message_get_flag(message, NOTMUCH_MESSAGE_FLAG_TAGS_INVALID)) {
status = _notmuch_message_tags_to_maildir (message);
if (status != NOTMUCH_PRIVATE_STATUS_SUCCESS) {
diff --git a/lib/notmuch.h b/lib/notmuch.h
index fe01e73..41820b5 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -176,6 +176,12 @@ notmuch_database_open (const char *path,
void
notmuch_database_close (notmuch_database_t *database);
+/* Sets whether maildir flags should be synchronized with notmuch
+ * tags. */
+void
+notmuch_database_set_maildir_sync (notmuch_database_t *database,
+ notmuch_bool_t maildir_sync);
+
/* Return the database path of the given database.
*
* The return value is a string owned by notmuch so should not be
diff --git a/notmuch-client.h b/notmuch-client.h
index d530578..c27d64f 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -195,6 +195,13 @@ notmuch_config_set_new_tags (notmuch_config_t *config,
size_t length);
notmuch_bool_t
+notmuch_config_get_maildir_sync (notmuch_config_t *config);
+
+void
+notmuch_config_set_maildir_sync (notmuch_config_t *config,
+ notmuch_bool_t maildir_sync);
+
+notmuch_bool_t
debugger_is_active (void);
#endif
diff --git a/notmuch-config.c b/notmuch-config.c
index dcdb036..483d5c6 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -61,6 +61,14 @@ static const char user_config_comment[] =
" recipient list of replies, and will set the From address based on the\n"
" address to which the original email was addressed.\n";
+static const char maildir_config_comment[] =
+ " Maildir compatibility configuration\n"
+ "\n"
+ " Here you can configure whether notmuch will synchronize its tags with\n"
+ " maildir flags."
+ "\n"
+ "\tsynchronize_flags Valid values are true and false.\n";
+
struct _notmuch_config {
char *filename;
GKeyFile *key_file;
@@ -72,8 +80,11 @@ struct _notmuch_config {
size_t user_other_email_length;
const char **new_tags;
size_t new_tags_length;
+ notmuch_bool_t maildir_sync;
};
+#define MAILDIR_SYNC_UNDEF ((notmuch_bool_t)-1)
+
static int
notmuch_config_destructor (notmuch_config_t *config)
{
@@ -191,6 +202,7 @@ notmuch_config_open (void *ctx,
int file_had_database_group;
int file_had_new_group;
int file_had_user_group;
+ int file_had_maildir_group;
if (is_new_ret)
*is_new_ret = 0;
@@ -221,6 +233,7 @@ notmuch_config_open (void *ctx,
config->user_other_email_length = 0;
config->new_tags = NULL;
config->new_tags_length = 0;
+ config->maildir_sync = MAILDIR_SYNC_UNDEF;
if (! g_key_file_load_from_file (config->key_file,
config->filename,
@@ -263,6 +276,7 @@ notmuch_config_open (void *ctx,
"database");
file_had_new_group = g_key_file_has_group (config->key_file, "new");
file_had_user_group = g_key_file_has_group (config->key_file, "user");
+ file_had_maildir_group = g_key_file_has_group (config->key_file,
"maildir");
if (notmuch_config_get_database_path (config) == NULL) {
@@ -313,6 +327,10 @@ notmuch_config_open (void *ctx,
notmuch_config_set_new_tags (config, tags, 2);
}
+ if (notmuch_config_get_maildir_sync (config) == MAILDIR_SYNC_UNDEF) {
+ notmuch_config_set_maildir_sync (config, FALSE);
+ }
+
/* Whenever we know of configuration sections that don't appear in
* the configuration file, we add some comments to help the user
* understand what can be done. */
@@ -340,6 +358,12 @@ notmuch_config_open (void *ctx,
user_config_comment, NULL);
}
+ if (! file_had_maildir_group)
+ {
+ g_key_file_set_comment (config->key_file, "maildir", NULL,
+ maildir_config_comment, NULL);
+ }
+
if (is_new_ret)
*is_new_ret = is_new;
@@ -703,3 +727,28 @@ notmuch_config_command (void *ctx, int argc, char *argv[])
argv[0]);
return 1;
}
+
+notmuch_bool_t
+notmuch_config_get_maildir_sync (notmuch_config_t *config)
+{
+ GError *err = NULL;
+ if (config->maildir_sync == MAILDIR_SYNC_UNDEF) {
+ config->maildir_sync =
+ g_key_file_get_boolean (config->key_file,
+ "maildir", "synchronize_flags", &err);
+ if (err) {
+ config->maildir_sync = MAILDIR_SYNC_UNDEF;
+ g_error_free (err);
+ }
+ }
+ return config->maildir_sync;
+}
+
+void
+notmuch_config_set_maildir_sync (notmuch_config_t *config,
+ notmuch_bool_t maildir_sync)
+{
+ g_key_file_set_boolean (config->key_file,
+ "maildir", "synchronize_flags", maildir_sync);
+ config->maildir_sync = maildir_sync;
+}
diff --git a/notmuch-new.c b/notmuch-new.c
index ed3f944..273916e 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -45,6 +45,7 @@ typedef struct {
_filename_list_t *removed_files;
_filename_list_t *removed_directories;
+ notmuch_bool_t maildir_sync;
} add_files_state_t;
static volatile sig_atomic_t do_add_files_print_progress = 0;
@@ -410,11 +411,13 @@ add_files_recursive (notmuch_database_t *notmuch,
state->added_messages++;
for (tag=state->new_tags; *tag != NULL; tag++)
notmuch_message_add_tag (message, *tag);
- notmuch_message_maildir_to_tags (message, next);
+ if (state->maildir_sync == TRUE)
+ notmuch_message_maildir_to_tags (message, next);
break;
/* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
- notmuch_message_maildir_to_tags (message, next);
+ if (state->maildir_sync == TRUE)
+ notmuch_message_maildir_to_tags (message, next);
break;
case NOTMUCH_STATUS_FILE_NOT_EMAIL:
fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
@@ -738,6 +741,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.maildir_sync = notmuch_config_get_maildir_sync (config);
db_path = notmuch_config_get_database_path (config);
dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");
diff --git a/notmuch-restore.c b/notmuch-restore.c
index b0a4e1c..b5c5c48 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -41,6 +41,8 @@ notmuch_restore_command (unused (void *ctx), int argc, char
*argv[])
if (notmuch == NULL)
return 1;
+ notmuch_database_set_maildir_sync (notmuch,
+ notmuch_config_get_maildir_sync
(config));
if (argc) {
input = fopen (argv[0], "r");
if (input == NULL) {
diff --git a/notmuch-setup.c b/notmuch-setup.c
index c3ea937..36ce71f 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -195,6 +195,16 @@ notmuch_setup_command (unused (void *ctx),
g_ptr_array_free (tags, TRUE);
}
+ prompt ("Synchronize maildir flags with notmuch tags? %s: ",
+ notmuch_config_get_maildir_sync (config) == TRUE ? "[yes]/no" :
"[no]/yes");
+ if (strlen (response) > 0) {
+ if (strcasecmp (response, "yes") == 0||
+ strcasecmp (response, "y") == 0)
+ notmuch_config_set_maildir_sync (config, TRUE);
+ else
+ notmuch_config_set_maildir_sync (config, FALSE);
+ }
+
if (! notmuch_config_save (config)) {
if (is_new)
welcome_message_post_setup ();
diff --git a/notmuch-tag.c b/notmuch-tag.c
index fd54bc7..3a489a9 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -100,6 +100,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused
(char *argv[]))
NOTMUCH_DATABASE_MODE_READ_WRITE);
if (notmuch == NULL)
return 1;
+ notmuch_database_set_maildir_sync (notmuch,
+ notmuch_config_get_maildir_sync
(config));
query = notmuch_query_create (notmuch, query_string);
if (query == NULL) {
--
1.7.1
