X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=database.cc;h=604062835427f0c539dd16791b24d84aab7d1da0;hp=f01ffa4b3f186a8945f1981798f46c7c9a09cb28;hb=494c74229bb8bdfc8571ce5de20a7beb0333c5f2;hpb=81861514c9a86350d24322c1de80b284bd2c1033

diff --git a/database.cc b/database.cc
index f01ffa4b..60406283 100644
--- a/database.cc
+++ b/database.cc
@@ -84,7 +84,7 @@ typedef struct {
  *
  * and has a single value:
  *
- *	TIMETAMPS:	The time_t value from the user.
+ *	TIMESTAMP:	The time_t value from the user.
  */
 
 /* With these prefix values we follow the conventions published here:
@@ -487,6 +487,9 @@ notmuch_database_open (const char *path)
     notmuch = talloc (NULL, notmuch_database_t);
     notmuch->path = talloc_strdup (notmuch, path);
 
+    if (notmuch->path[strlen (notmuch->path) - 1] == '/')
+	notmuch->path[strlen (notmuch->path) - 1] = '\0';
+
     try {
 	notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
 							   Xapian::DB_CREATE_OR_OPEN);
@@ -856,9 +859,10 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
     notmuch_message_file_t *message_file;
     notmuch_message_t *message;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
+    notmuch_private_status_t private_status;
 
     const char *date, *header;
-    const char *from, *to, *subject, *old_filename;
+    const char *from, *to, *subject;
     char *message_id;
 
     if (message_ret)
@@ -881,7 +885,25 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 					   (char *) NULL);
 
     try {
-	/* The first order of business is to find/create a message ID. */
+	/* Before we do any real work, (especially before doing a
+	 * potential SHA-1 computation on the entire file's contents),
+	 * let's make sure that what we're looking at looks like an
+	 * actual email message.
+	 */
+	from = notmuch_message_file_get_header (message_file, "from");
+	subject = notmuch_message_file_get_header (message_file, "subject");
+	to = notmuch_message_file_get_header (message_file, "to");
+
+	if (from == NULL &&
+	    subject == NULL &&
+	    to == NULL)
+	{
+	    ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;
+	    goto DONE;
+	}
+
+	/* Now that we're sure it's mail, the first order of business
+	 * is to find a message ID (or else create one ourselves). */
 
 	header = notmuch_message_file_get_header (message_file, "message-id");
 	if (header) {
@@ -914,21 +936,20 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	message = _notmuch_message_create_for_message_id (NULL,
 							  notmuch,
 							  message_id,
-							  &ret);
+							  &private_status);
 
 	talloc_free (message_id);
 
 	if (message == NULL)
 	    goto DONE;
 
-	/* Has a message previously been added with the same ID? */
-	old_filename = notmuch_message_get_filename (message);
-	if (old_filename && strlen (old_filename)) {
-	    ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
-	    goto DONE;
-	} else {
+	/* Is this a newly created message object? */
+	if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {
 	    _notmuch_message_set_filename (message, filename);
 	    _notmuch_message_add_term (message, "type", "mail");
+	} else {
+	    ret = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
+	    goto DONE;
 	}
 
 	ret = _notmuch_database_link_message (notmuch, message, message_file);
@@ -938,18 +959,6 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	date = notmuch_message_file_get_header (message_file, "date");
 	_notmuch_message_set_date (message, date);
 
-	from = notmuch_message_file_get_header (message_file, "from");
-	subject = notmuch_message_file_get_header (message_file, "subject");
-	to = notmuch_message_file_get_header (message_file, "to");
-
-	if (from == NULL &&
-	    subject == NULL &&
-	    to == NULL)
-	{
-	    ret = NOTMUCH_STATUS_FILE_NOT_EMAIL;
-	    goto DONE;
-	}
-
 	_notmuch_message_index_file (message, filename);
 
 	_notmuch_message_sync (message);