1 Return-Path: <sojkam1@fel.cvut.cz>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id AE8F541733A
\r
6 for <notmuch@notmuchmail.org>; Fri, 26 Mar 2010 14:43:17 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5
\r
12 tests=[BAYES_00=-1.9] autolearn=ham
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id vwV+4dkjs1pp for <notmuch@notmuchmail.org>;
\r
16 Fri, 26 Mar 2010 14:43:13 -0700 (PDT)
\r
17 Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 932304196F2
\r
19 for <notmuch@notmuchmail.org>; Fri, 26 Mar 2010 14:43:12 -0700 (PDT)
\r
20 Received: from localhost (unknown [192.168.200.4])
\r
21 by max.feld.cvut.cz (Postfix) with ESMTP id C680D19F3602;
\r
22 Fri, 26 Mar 2010 22:43:11 +0100 (CET)
\r
23 X-Virus-Scanned: IMAP AMAVIS
\r
24 Received: from max.feld.cvut.cz ([192.168.200.1])
\r
25 by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new,
\r
27 with ESMTP id 2iC5yqRjuB6y; Fri, 26 Mar 2010 22:43:09 +0100 (CET)
\r
28 Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])
\r
29 by max.feld.cvut.cz (Postfix) with ESMTP id A6E9019F33C7;
\r
30 Fri, 26 Mar 2010 22:43:09 +0100 (CET)
\r
31 Received: from steelpick.2x.cz (r5da224.net.upc.cz [86.49.116.224])
\r
32 (Authenticated sender: sojkam1)
\r
33 by imap.feld.cvut.cz (Postfix) with ESMTPSA id 7B4D915C062;
\r
34 Fri, 26 Mar 2010 22:43:09 +0100 (CET)
\r
35 Received: from wsh by steelpick.2x.cz with local (Exim 4.71)
\r
36 (envelope-from <sojkam1@fel.cvut.cz>)
\r
37 id 1NvHJ6-0006i7-W1; Fri, 26 Mar 2010 22:43:09 +0100
\r
38 From: Michal Sojka <sojkam1@fel.cvut.cz>
\r
39 To: notmuch@notmuchmail.org
\r
40 Date: Fri, 26 Mar 2010 22:42:54 +0100
\r
41 Message-Id: <1269639777-25765-1-git-send-email-sojkam1@fel.cvut.cz>
\r
42 X-Mailer: git-send-email 1.7.0.2
\r
43 In-Reply-To: <87tys292w7.fsf@steelpick.2x.cz>
\r
44 References: <87tys292w7.fsf@steelpick.2x.cz>
\r
45 Subject: [notmuch] [PATCH v2 1/4] Mailstore abstraction interface
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Fri, 26 Mar 2010 21:43:18 -0000
\r
60 The goal of mailstore abstraction is to allow notmuch to store tags
\r
61 together with email messages. The abstract interface is needed because
\r
62 people want to use different ways of storing their emails. This
\r
63 patchseries implements two types of mailstore - plain files and
\r
64 maildir. It is expected that additional git-based mailstore will
\r
67 This patch contains only the interface changes. No functionality is
\r
68 added, removed or changed.
\r
70 A new configuration group [mailstore] is defined. Currently, there is
\r
71 only one key 'type' whose value determines the used mailstore. The
\r
72 default value of this option is the plain-file mailstore currently
\r
73 implemented in notmuch.
\r
75 Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
\r
77 lib/Makefile.local | 2 +
\r
78 lib/database-private.h | 1 +
\r
79 lib/database.cc | 15 ++++++--
\r
80 lib/mailstore-files.c | 43 +++++++++++++++++++++++++
\r
81 lib/mailstore-private.h | 59 ++++++++++++++++++++++++++++++++++
\r
82 lib/mailstore.c | 77 ++++++++++++++++++++++++++++++++++++++++++++
\r
83 lib/message.cc | 13 +++++++
\r
84 lib/notmuch.h | 81 ++++++++++++++++++++++++++++++++++++++++++++--
\r
85 notmuch-client.h | 7 ++++
\r
86 notmuch-config.c | 34 +++++++++++++++++++
\r
87 notmuch-count.c | 3 +-
\r
88 notmuch-dump.c | 3 +-
\r
89 notmuch-new.c | 6 ++-
\r
90 notmuch-reply.c | 3 +-
\r
91 notmuch-restore.c | 3 +-
\r
92 notmuch-search-tags.c | 3 +-
\r
93 notmuch-search.c | 3 +-
\r
94 notmuch-show.c | 3 +-
\r
95 notmuch-tag.c | 3 +-
\r
96 19 files changed, 344 insertions(+), 18 deletions(-)
\r
97 create mode 100644 lib/mailstore-files.c
\r
98 create mode 100644 lib/mailstore-private.h
\r
99 create mode 100644 lib/mailstore.c
\r
101 diff --git a/lib/Makefile.local b/lib/Makefile.local
\r
102 index 495b27e..fc8883d 100644
\r
103 --- a/lib/Makefile.local
\r
104 +++ b/lib/Makefile.local
\r
105 @@ -3,6 +3,8 @@ extra_cflags += -I$(dir)
\r
107 libnotmuch_c_srcs = \
\r
109 + $(dir)/mailstore.c \
\r
110 + $(dir)/mailstore-files.c\
\r
111 $(dir)/message-file.c \
\r
112 $(dir)/messages.c \
\r
114 diff --git a/lib/database-private.h b/lib/database-private.h
\r
115 index 41918d7..4499b1a 100644
\r
116 --- a/lib/database-private.h
\r
117 +++ b/lib/database-private.h
\r
118 @@ -49,6 +49,7 @@ struct _notmuch_database {
\r
119 Xapian::TermGenerator *term_gen;
\r
120 Xapian::ValueRangeProcessor *value_range_processor;
\r
122 + notmuch_mailstore_t *mailstore;
\r
125 /* Convert tags from Xapian internal format to notmuch format.
\r
126 diff --git a/lib/database.cc b/lib/database.cc
\r
127 index c91e97c..93c8d0f 100644
\r
128 --- a/lib/database.cc
\r
129 +++ b/lib/database.cc
\r
133 #include "database-private.h"
\r
134 +#include "mailstore-private.h"
\r
136 #include <iostream>
\r
138 @@ -438,7 +439,7 @@ parse_references (void *ctx,
\r
141 notmuch_database_t *
\r
142 -notmuch_database_create (const char *path)
\r
143 +notmuch_database_create (const char *path, notmuch_mailstore_t *mailstore)
\r
145 notmuch_database_t *notmuch = NULL;
\r
146 char *notmuch_path = NULL;
\r
147 @@ -474,7 +475,8 @@ notmuch_database_create (const char *path)
\r
150 notmuch = notmuch_database_open (path,
\r
151 - NOTMUCH_DATABASE_MODE_READ_WRITE);
\r
152 + NOTMUCH_DATABASE_MODE_READ_WRITE,
\r
154 notmuch_database_upgrade (notmuch, NULL, NULL);
\r
157 @@ -497,7 +499,8 @@ _notmuch_database_ensure_writable (notmuch_database_t *notmuch)
\r
159 notmuch_database_t *
\r
160 notmuch_database_open (const char *path,
\r
161 - notmuch_database_mode_t mode)
\r
162 + notmuch_database_mode_t mode,
\r
163 + notmuch_mailstore_t *mailstore)
\r
165 notmuch_database_t *notmuch = NULL;
\r
166 char *notmuch_path = NULL, *xapian_path = NULL;
\r
167 @@ -605,6 +608,9 @@ notmuch_database_open (const char *path,
\r
168 prefix_t *prefix = &PROBABILISTIC_PREFIX[i];
\r
169 notmuch->query_parser->add_prefix (prefix->name, prefix->prefix);
\r
172 + notmuch->mailstore = mailstore;
\r
173 + mailstore->notmuch = notmuch;
\r
174 } catch (const Xapian::Error &error) {
\r
175 fprintf (stderr, "A Xapian exception occurred opening database: %s\n",
\r
176 error.get_msg().c_str());
\r
177 @@ -1493,7 +1499,8 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
\r
181 - if (ret == NOTMUCH_STATUS_SUCCESS && message_ret)
\r
182 + if ((ret == NOTMUCH_STATUS_SUCCESS ||
\r
183 + ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) && message_ret)
\r
184 *message_ret = message;
\r
186 notmuch_message_destroy (message);
\r
187 diff --git a/lib/mailstore-files.c b/lib/mailstore-files.c
\r
188 new file mode 100644
\r
189 index 0000000..92d7f5d
\r
191 +++ b/lib/mailstore-files.c
\r
193 +/* mailstore-files.c - Original notmuch mail store - a collection of
\r
194 + * plain-text email messages (one message per file).
\r
196 + * Copyright © 2009 Carl Worth
\r
198 + * This program is free software: you can redistribute it and/or modify
\r
199 + * it under the terms of the GNU General Public License as published by
\r
200 + * the Free Software Foundation, either version 3 of the License, or
\r
201 + * (at your option) any later version.
\r
203 + * This program is distributed in the hope that it will be useful,
\r
204 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
205 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
206 + * GNU General Public License for more details.
\r
208 + * You should have received a copy of the GNU General Public License
\r
209 + * along with this program. If not, see http://www.gnu.org/licenses/ .
\r
211 + * Authors: Carl Worth <cworth@cworth.org>
\r
212 + * Michal Sojka <sojkam1@fel.cvut.cz>
\r
215 +#include "notmuch.h"
\r
216 +#include "mailstore-private.h"
\r
220 +open_file(notmuch_mailstore_t *mailstore, const char *filename)
\r
222 + const char *db_path, *abs_filename;
\r
224 + db_path = notmuch_database_get_path(mailstore->notmuch);
\r
225 + abs_filename = talloc_asprintf(mailstore, "%s/%s", db_path, filename);
\r
226 + if (unlikely(abs_filename == NULL))
\r
228 + return fopen (abs_filename, "r");
\r
231 +/* Original notmuch mail store */
\r
232 +struct _notmuch_mailstore mailstore_files = {
\r
234 + .open_file = open_file,
\r
236 diff --git a/lib/mailstore-private.h b/lib/mailstore-private.h
\r
237 new file mode 100644
\r
238 index 0000000..f606e3f
\r
240 +++ b/lib/mailstore-private.h
\r
242 +/* mailstore-private.h - Mailstore abstraction
\r
244 + * Copyright © 2010 Michal Sojka
\r
246 + * This program is free software: you can redistribute it and/or modify
\r
247 + * it under the terms of the GNU General Public License as published by
\r
248 + * the Free Software Foundation, either version 3 of the License, or
\r
249 + * (at your option) any later version.
\r
251 + * This program is distributed in the hope that it will be useful,
\r
252 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
253 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
254 + * GNU General Public License for more details.
\r
256 + * You should have received a copy of the GNU General Public License
\r
257 + * along with this program. If not, see http://www.gnu.org/licenses/ .
\r
259 + * Author: Michal Sojka <sojkam1@fel.cvut.cz>
\r
262 +#ifndef MAILSTORE_PRIVATE_H
\r
263 +#define MAILSTORE_PRIVATE_H
\r
265 +#include "notmuch-private.h"
\r
267 +struct _notmuch_mailstore {
\r
268 + /* Constant fields */
\r
269 + const char *type; /* identification in .notmuch-config */
\r
272 + /* Count files in mailstore so that initial invocation of notmuch
\r
273 + * new can report remaining time */
\r
274 + void (*count_files)(notmuch_mailstore_t *mailstore,
\r
275 + const char *path, int *count,
\r
276 + volatile sig_atomic_t *interrupted);
\r
277 + /* Scan for new messages and add them to the database. */
\r
278 + notmuch_private_status_t (*index_new)(notmuch_mailstore_t *mailstore,
\r
279 + const char* path,
\r
280 + notmuch_indexing_context_t *ctx);
\r
281 + /* Store the tags assigned to the 'messages' to the
\r
282 + * 'mailstore'. */
\r
283 + notmuch_private_status_t (*sync_tags)(notmuch_mailstore_t *mailstore,
\r
284 + notmuch_message_t *message);
\r
285 + /* Return file handle from which the message can be read.
\r
287 + * Currently, this is not used and all message access is hardcoded
\r
288 + * to notmuch. We will need this operation for git-based and other
\r
289 + * non-filesystem mailstores. */
\r
290 + FILE * (*open_file)(notmuch_mailstore_t *mailstore,
\r
291 + const char *filename);
\r
293 + /* Run-time fields */
\r
294 + notmuch_database_t *notmuch;
\r
297 +extern struct _notmuch_mailstore mailstore_files;
\r
298 +extern struct _notmuch_mailstore mailstore_maildir;
\r
300 +#endif /* MAILSTORE_PRIVATE_H */
\r
301 diff --git a/lib/mailstore.c b/lib/mailstore.c
\r
302 new file mode 100644
\r
303 index 0000000..cdac9a6
\r
305 +++ b/lib/mailstore.c
\r
307 +/* mailstore.c - Mailstore abstraction
\r
309 + * Copyright © 2010 Michal Sojka
\r
311 + * This program is free software: you can redistribute it and/or modify
\r
312 + * it under the terms of the GNU General Public License as published by
\r
313 + * the Free Software Foundation, either version 3 of the License, or
\r
314 + * (at your option) any later version.
\r
316 + * This program is distributed in the hope that it will be useful,
\r
317 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
318 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
319 + * GNU General Public License for more details.
\r
321 + * You should have received a copy of the GNU General Public License
\r
322 + * along with this program. If not, see http://www.gnu.org/licenses/ .
\r
324 + * Author: Michal Sojka <sojkam1@fel.cvut.cz>
\r
327 +#include <notmuch.h>
\r
328 +#include "mailstore-private.h"
\r
330 +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
\r
332 +static notmuch_mailstore_t *available[] = {
\r
333 + &mailstore_files,
\r
336 +notmuch_mailstore_t *
\r
337 +notmuch_mailstore_get_by_type (const char *type)
\r
341 + if (type == NULL)
\r
342 + return available[0];
\r
344 + for (i = 0; i < ARRAY_SIZE(available); i++) {
\r
345 + if (strcasecmp (type, available[i]->type) == 0)
\r
346 + return available[i];
\r
352 +notmuch_mailstore_get_type (notmuch_mailstore_t *mailstore)
\r
357 + return mailstore->type;
\r
361 +notmuch_mailstore_count_files (notmuch_mailstore_t *mailstore,
\r
362 + const char *path, int *count,
\r
363 + volatile sig_atomic_t *interrupted)
\r
365 + mailstore->count_files (mailstore, path, count, interrupted);
\r
369 +notmuch_mailstore_index_new (notmuch_mailstore_t *mailstore,
\r
370 + const char *path,
\r
371 + notmuch_indexing_context_t *ctx)
\r
373 + notmuch_private_status_t status;
\r
374 + status = mailstore->index_new (mailstore, path, ctx);
\r
375 + return COERCE_STATUS (status, "Index new");
\r
379 +notmuch_mailstore_open_file (notmuch_mailstore_t *mailstore,
\r
380 + const char *filename)
\r
382 + return mailstore->open_file (mailstore, filename);
\r
384 diff --git a/lib/message.cc b/lib/message.cc
\r
385 index 721c9a6..c32ee7d 100644
\r
386 --- a/lib/message.cc
\r
387 +++ b/lib/message.cc
\r
390 #include "notmuch-private.h"
\r
391 #include "database-private.h"
\r
392 +#include "mailstore-private.h"
\r
394 #include <stdint.h>
\r
396 @@ -555,10 +556,22 @@ void
\r
397 _notmuch_message_sync (notmuch_message_t *message)
\r
399 Xapian::WritableDatabase *db;
\r
400 + notmuch_private_status_t status;
\r
402 if (message->notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
\r
405 + if (message->notmuch->mailstore->sync_tags) {
\r
406 + status = message->notmuch->mailstore->sync_tags (message->notmuch->mailstore,
\r
408 + if (status != NOTMUCH_PRIVATE_STATUS_SUCCESS) {
\r
409 + fprintf (stderr, "Error: Cannot sync tags to mailstore (%s)\n",
\r
410 + notmuch_status_to_string ((notmuch_status_t)status));
\r
411 + /* Exit to avoid unsynchronized mailstore. */
\r
416 db = static_cast <Xapian::WritableDatabase *> (message->notmuch->xapian_db);
\r
417 db->replace_document (message->doc_id, message->doc);
\r
419 diff --git a/lib/notmuch.h b/lib/notmuch.h
\r
420 index 0d9cb0f..8fa7b31 100644
\r
421 --- a/lib/notmuch.h
\r
422 +++ b/lib/notmuch.h
\r
424 NOTMUCH_BEGIN_DECLS
\r
427 +#include <signal.h> /* For sig_atomic_t */
\r
428 +#include <stdio.h> /* For FILE */
\r
432 @@ -119,6 +121,8 @@ typedef struct _notmuch_message notmuch_message_t;
\r
433 typedef struct _notmuch_tags notmuch_tags_t;
\r
434 typedef struct _notmuch_directory notmuch_directory_t;
\r
435 typedef struct _notmuch_filenames notmuch_filenames_t;
\r
436 +typedef struct _notmuch_mailstore notmuch_mailstore_t;
\r
439 /* Create a new, empty notmuch database located at 'path'.
\r
441 @@ -127,6 +131,8 @@ typedef struct _notmuch_filenames notmuch_filenames_t;
\r
442 * create a new ".notmuch" directory within 'path' where notmuch will
\r
445 + * FIXME: Mailstore...
\r
447 * After a successful call to notmuch_database_create, the returned
\r
448 * database will be open so the caller should call
\r
449 * notmuch_database_close when finished with it.
\r
450 @@ -140,7 +146,7 @@ typedef struct _notmuch_filenames notmuch_filenames_t;
\r
451 * an error message on stderr).
\r
453 notmuch_database_t *
\r
454 -notmuch_database_create (const char *path);
\r
455 +notmuch_database_create (const char *path, notmuch_mailstore_t *mailstore);
\r
458 NOTMUCH_DATABASE_MODE_READ_ONLY = 0,
\r
459 @@ -152,6 +158,8 @@ typedef enum {
\r
461 /* Open an existing notmuch database located at 'path'.
\r
463 + * The database will index mails stored in 'mailstore'.
\r
465 * The database should have been created at some time in the past,
\r
466 * (not necessarily by this process), by calling
\r
467 * notmuch_database_create with 'path'. By default the database should be
\r
468 @@ -169,7 +177,8 @@ typedef enum {
\r
470 notmuch_database_t *
\r
471 notmuch_database_open (const char *path,
\r
472 - notmuch_database_mode_t mode);
\r
473 + notmuch_database_mode_t mode,
\r
474 + notmuch_mailstore_t *mailstore);
\r
476 /* Close the given notmuch database, freeing all associated
\r
477 * resources. See notmuch_database_open. */
\r
478 @@ -236,7 +245,8 @@ notmuch_database_get_directory (notmuch_database_t *database,
\r
479 * notmuch database will reference the filename, and will not copy the
\r
480 * entire contents of the file.
\r
482 - * If 'message' is not NULL, then, on successful return '*message'
\r
483 + * If 'message' is not NULL, then, on successful return
\r
484 + * (NOTMUCH_STATUS_SUCCESS or NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) '*message'
\r
485 * will be initialized to a message object that can be used for things
\r
486 * such as adding tags to the just-added message. The user should call
\r
487 * notmuch_message_destroy when done with the message. On any failure
\r
488 @@ -495,7 +505,7 @@ notmuch_threads_destroy (notmuch_threads_t *threads);
\r
491 notmuch_query_count_messages (notmuch_query_t *query);
\r
494 /* Get the thread ID of 'thread'.
\r
496 * The returned string belongs to 'thread' and as such, should not be
\r
497 @@ -1104,6 +1114,69 @@ notmuch_filenames_move_to_next (notmuch_filenames_t *filenames);
\r
499 notmuch_filenames_destroy (notmuch_filenames_t *filenames);
\r
501 +/* Returns notmuch_mailstore_t object of a given 'type'.
\r
503 + * The 'type' is case insensitive. If 'type' is NULL, a default
\r
504 + * mailstore is returned.
\r
506 + * When no available mailstore matches 'type', NULL is returned.
\r
508 +notmuch_mailstore_t *
\r
509 +notmuch_mailstore_get_by_type (const char *type);
\r
511 +/* Returns the type of a mailstore.
\r
513 + * The returned string is owned by mailstore so should not be modified
\r
514 + * nor freed by the caller.
\r
517 +notmuch_mailstore_get_type (notmuch_mailstore_t *mailstore);
\r
519 +/* Count emails in mailstore.
\r
521 + * This function returns when interrupted is set to non-zero value.
\r
524 +notmuch_mailstore_count_files (notmuch_mailstore_t *mailstore,
\r
525 + const char *path, int *count,
\r
526 + volatile sig_atomic_t *interrupted);
\r
528 +typedef struct notmuch_indexing_context {
\r
530 + int processed_files;
\r
531 + int added_messages;
\r
532 + int renamed_files;
\r
533 + int removed_files;
\r
538 + volatile sig_atomic_t interrupted;
\r
539 + volatile sig_atomic_t print_progress;
\r
540 + void (*print_progress_cb)(struct notmuch_indexing_context *ctx);
\r
541 + void (*print_verbose_cb)(struct notmuch_indexing_context *ctx, const char *filename);
\r
542 +} notmuch_indexing_context_t;
\r
545 +/* Index new mails in the mailstore.
\r
547 + * Mailstore is responsible for detecting new emails, adding them to
\r
548 + * the database and tagging them with tags stored in the mailstore.
\r
551 +notmuch_mailstore_index_new (notmuch_mailstore_t *mailstore,
\r
552 + const char *path,
\r
553 + notmuch_indexing_context_t *ctx);
\r
555 +/* Returns file handle to the file in the mailstore.
\r
557 + * TODO: This function is currently not used and access to mails is
\r
558 + * hardcoded in other parts of notmuch.
\r
561 +notmuch_mailstore_open_file (notmuch_mailstore_t *mailstore,
\r
562 + const char *filename);
\r
567 diff --git a/notmuch-client.h b/notmuch-client.h
\r
568 index c80b39c..4794b8e 100644
\r
569 --- a/notmuch-client.h
\r
570 +++ b/notmuch-client.h
\r
571 @@ -171,6 +171,13 @@ notmuch_config_set_user_other_email (notmuch_config_t *config,
\r
572 const char *other_email[],
\r
575 +notmuch_mailstore_t *
\r
576 +notmuch_config_get_mailstore(notmuch_config_t *config);
\r
579 +notmuch_config_set_mailstore(notmuch_config_t *config,
\r
580 + notmuch_mailstore_t *mailstore);
\r
583 debugger_is_active (void);
\r
585 diff --git a/notmuch-config.c b/notmuch-config.c
\r
586 index 95430db..299423a 100644
\r
587 --- a/notmuch-config.c
\r
588 +++ b/notmuch-config.c
\r
589 @@ -62,6 +62,7 @@ struct _notmuch_config {
\r
590 char *user_primary_email;
\r
591 char **user_other_email;
\r
592 size_t user_other_email_length;
\r
593 + notmuch_mailstore_t *mailstore;
\r
597 @@ -199,6 +200,7 @@ notmuch_config_open (void *ctx,
\r
598 config->user_primary_email = NULL;
\r
599 config->user_other_email = NULL;
\r
600 config->user_other_email_length = 0;
\r
601 + config->mailstore = NULL;
\r
603 if (! g_key_file_load_from_file (config->key_file,
\r
605 @@ -264,6 +266,10 @@ notmuch_config_open (void *ctx,
\r
609 + if (notmuch_config_get_mailstore (config) == NULL) {
\r
610 + notmuch_config_set_mailstore(config, notmuch_mailstore_get_by_type(NULL));
\r
613 /* When we create a new configuration file here, we add some
\r
614 * comments to help the user understand what can be done. */
\r
616 @@ -452,3 +458,31 @@ notmuch_config_set_user_other_email (notmuch_config_t *config,
\r
617 talloc_free (config->user_other_email);
\r
618 config->user_other_email = NULL;
\r
621 +notmuch_mailstore_t *
\r
622 +notmuch_config_get_mailstore(notmuch_config_t *config)
\r
626 + if (config->mailstore == NULL) {
\r
627 + type = g_key_file_get_string (config->key_file,
\r
628 + "mailstore", "type", NULL);
\r
630 + config->mailstore = notmuch_mailstore_get_by_type(type);
\r
635 + return config->mailstore;
\r
639 +notmuch_config_set_mailstore(notmuch_config_t *config,
\r
640 + notmuch_mailstore_t *mailstore)
\r
642 + g_key_file_set_string (config->key_file,
\r
643 + "mailstore", "type",
\r
644 + notmuch_mailstore_get_type(mailstore));
\r
646 + config->mailstore = NULL;
\r
648 diff --git a/notmuch-count.c b/notmuch-count.c
\r
649 index 77aa433..631b8f8 100644
\r
650 --- a/notmuch-count.c
\r
651 +++ b/notmuch-count.c
\r
652 @@ -81,7 +81,8 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
\r
655 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
656 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
657 + NOTMUCH_DATABASE_MODE_READ_ONLY,
\r
658 + notmuch_config_get_mailstore(config));
\r
659 if (notmuch == NULL)
\r
662 diff --git a/notmuch-dump.c b/notmuch-dump.c
\r
663 index 7e7bc17..e74dfcb 100644
\r
664 --- a/notmuch-dump.c
\r
665 +++ b/notmuch-dump.c
\r
666 @@ -36,7 +36,8 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
\r
669 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
670 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
671 + NOTMUCH_DATABASE_MODE_READ_ONLY,
\r
672 + notmuch_config_get_mailstore (config));
\r
673 if (notmuch == NULL)
\r
676 diff --git a/notmuch-new.c b/notmuch-new.c
\r
677 index 44b50aa..2d0ba6c 100644
\r
678 --- a/notmuch-new.c
\r
679 +++ b/notmuch-new.c
\r
680 @@ -749,11 +749,13 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
\r
683 printf ("Found %d total files (that's not much mail).\n", count);
\r
684 - notmuch = notmuch_database_create (db_path);
\r
685 + notmuch = notmuch_database_create (db_path,
\r
686 + notmuch_config_get_mailstore (config));
\r
687 add_files_state.total_files = count;
\r
689 notmuch = notmuch_database_open (db_path,
\r
690 - NOTMUCH_DATABASE_MODE_READ_WRITE);
\r
691 + NOTMUCH_DATABASE_MODE_READ_WRITE,
\r
692 + notmuch_config_get_mailstore (config));
\r
693 if (notmuch == NULL)
\r
696 diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
697 index 6c15536..0d6b7cf 100644
\r
698 --- a/notmuch-reply.c
\r
699 +++ b/notmuch-reply.c
\r
700 @@ -468,7 +468,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
\r
703 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
704 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
705 + NOTMUCH_DATABASE_MODE_READ_ONLY,
\r
706 + notmuch_config_get_mailstore (config));
\r
707 if (notmuch == NULL)
\r
710 diff --git a/notmuch-restore.c b/notmuch-restore.c
\r
711 index b0a4e1c..97d817b 100644
\r
712 --- a/notmuch-restore.c
\r
713 +++ b/notmuch-restore.c
\r
714 @@ -37,7 +37,8 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
\r
717 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
718 - NOTMUCH_DATABASE_MODE_READ_WRITE);
\r
719 + NOTMUCH_DATABASE_MODE_READ_WRITE,
\r
720 + notmuch_config_get_mailstore (config));
\r
721 if (notmuch == NULL)
\r
724 diff --git a/notmuch-search-tags.c b/notmuch-search-tags.c
\r
725 index 6f3cfcc..323f416 100644
\r
726 --- a/notmuch-search-tags.c
\r
727 +++ b/notmuch-search-tags.c
\r
728 @@ -52,7 +52,8 @@ notmuch_search_tags_command (void *ctx, int argc, char *argv[])
\r
731 db = notmuch_database_open (notmuch_config_get_database_path (config),
\r
732 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
733 + NOTMUCH_DATABASE_MODE_READ_ONLY,
\r
734 + notmuch_config_get_mailstore (config));
\r
738 diff --git a/notmuch-search.c b/notmuch-search.c
\r
739 index 4e3514b..d57479d 100644
\r
740 --- a/notmuch-search.c
\r
741 +++ b/notmuch-search.c
\r
742 @@ -245,7 +245,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
\r
745 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
746 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
747 + NOTMUCH_DATABASE_MODE_READ_ONLY,
\r
748 + notmuch_config_get_mailstore (config));
\r
749 if (notmuch == NULL)
\r
752 diff --git a/notmuch-show.c b/notmuch-show.c
\r
753 index ff1fecb..26581c1 100644
\r
754 --- a/notmuch-show.c
\r
755 +++ b/notmuch-show.c
\r
756 @@ -458,7 +458,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
759 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
760 - NOTMUCH_DATABASE_MODE_READ_ONLY);
\r
761 + NOTMUCH_DATABASE_MODE_READ_ONLY,
\r
762 + notmuch_config_get_mailstore (config));
\r
763 if (notmuch == NULL)
\r
766 diff --git a/notmuch-tag.c b/notmuch-tag.c
\r
767 index 8b6f7dc..5e1a5c3 100644
\r
768 --- a/notmuch-tag.c
\r
769 +++ b/notmuch-tag.c
\r
770 @@ -97,7 +97,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
773 notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
\r
774 - NOTMUCH_DATABASE_MODE_READ_WRITE);
\r
775 + NOTMUCH_DATABASE_MODE_READ_WRITE,
\r
776 + notmuch_config_get_mailstore (config));
\r
777 if (notmuch == NULL)
\r