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.
notmuch = NULL;
}
+ notmuch_database_set_maildir_sync (notmuch, FALSE);
+
DONE:
if (notmuch_path)
free (notmuch_path);
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)
{
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) {
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
const char *new_tags[],
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);
" 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;
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)
{
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;
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,
"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) {
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. */
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;
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;
+}
_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;
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",
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");
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) {
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 ();
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) {