1 From: "Mikhail Gusarov" <dottedmag@dottedmag.net>
2 To: notmuch@notmuchmail.org
3 Date: Wed, 18 Nov 2009 02:51:18 +0600
4 Subject: [notmuch] [PATCH] Handle rename of message file
5 Message-ID: <1258491078-29658-1-git-send-email-dottedmag@dottedmag.net>
7 If message file has been renamed, just update filename in the DB.
9 Signed-off-by: Mikhail Gusarov <dottedmag at dottedmag.net>
11 lib/database.cc | 21 ++++++++++++---------
12 1 files changed, 12 insertions(+), 9 deletions(-)
14 diff --git a/lib/database.cc b/lib/database.cc
15 index 3c8d626..c4eb8b6 100644
18 @@ -925,20 +925,23 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
19 if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {
20 _notmuch_message_set_filename (message, filename);
21 _notmuch_message_add_term (message, "type", "mail");
23 + ret = _notmuch_database_link_message (notmuch, message, message_file);
27 + date = notmuch_message_file_get_header (message_file, "date");
28 + _notmuch_message_set_date (message, date);
30 + _notmuch_message_index_file (message, filename);
31 + } else if (strcmp(notmuch_message_get_filename(message), filename)) {
32 + /* Message file has been moved/renamed */
33 + _notmuch_message_set_filename (message, filename);
35 ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
39 - ret = _notmuch_database_link_message (notmuch, message, message_file);
43 - date = notmuch_message_file_get_header (message_file, "date");
44 - _notmuch_message_set_date (message, date);
46 - _notmuch_message_index_file (message, filename);
48 _notmuch_message_sync (message);
49 } catch (const Xapian::Error &error) {
50 fprintf (stderr, "A Xapian exception occurred: %s.\n",