From 828643c61a643cacc9564d71561ed5b21d41b77d Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sun, 3 Apr 2016 11:15:40 +2100 Subject: [PATCH] [PATCH v2 6/7] On deletion, replace with ghost when other active messages in thread --- fe/3d575be4141df437401e0aaa896402e91e22d6 | 140 ++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 fe/3d575be4141df437401e0aaa896402e91e22d6 diff --git a/fe/3d575be4141df437401e0aaa896402e91e22d6 b/fe/3d575be4141df437401e0aaa896402e91e22d6 new file mode 100644 index 000000000..bfe6ed48a --- /dev/null +++ b/fe/3d575be4141df437401e0aaa896402e91e22d6 @@ -0,0 +1,140 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 221AA6DE091F + for ; Sat, 2 Apr 2016 07:16:19 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.244 +X-Spam-Level: +X-Spam-Status: No, score=-0.244 tagged_above=-999 required=5 + tests=[AWL=-0.244] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id wRtNIK7n5KyE for ; + Sat, 2 Apr 2016 07:16:11 -0700 (PDT) +Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108]) + by arlo.cworth.org (Postfix) with ESMTP id C47E16DE02DB + for ; Sat, 2 Apr 2016 07:15:55 -0700 (PDT) +Received: from fifthhorseman.net (dhcp-a244.meeting.ietf.org [31.133.162.68]) + by che.mayfirst.org (Postfix) with ESMTPSA id 6847DF997 + for ; Sat, 2 Apr 2016 10:15:54 -0400 (EDT) +Received: by fifthhorseman.net (Postfix, from userid 1000) + id B6F8920CD0; Sat, 2 Apr 2016 11:15:41 -0300 (BRT) +From: Daniel Kahn Gillmor +To: Notmuch Mail +Subject: [PATCH v2 6/7] On deletion, + replace with ghost when other active messages in thread +Date: Sat, 2 Apr 2016 11:15:40 -0300 +Message-Id: <1459606541-23889-6-git-send-email-dkg@fifthhorseman.net> +X-Mailer: git-send-email 2.8.0.rc3 +In-Reply-To: <1459606541-23889-1-git-send-email-dkg@fifthhorseman.net> +References: <1459445693-3900-1-git-send-email-dkg@fifthhorseman.net> + <1459606541-23889-1-git-send-email-dkg@fifthhorseman.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 02 Apr 2016 14:16:19 -0000 + +There is no need to add a ghost message upon deletion if there are no +other active messages in the thread. + +Also, if the message being deleted was a ghost already, we can just go +ahead and delete it. +--- + lib/message.cc | 58 ++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 42 insertions(+), 16 deletions(-) + +diff --git a/lib/message.cc b/lib/message.cc +index fab70fd..f715e39 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -1044,11 +1044,14 @@ _notmuch_message_delete (notmuch_message_t *message) + { + notmuch_status_t status; + Xapian::WritableDatabase *db; +- const char *mid, *tid; ++ const char *mid, *tid, *query_string; + notmuch_message_t *ghost; + notmuch_private_status_t private_status; + notmuch_database_t *notmuch; +- ++ notmuch_query_t *query; ++ unsigned int count = 0; ++ notmuch_bool_t is_ghost; ++ + mid = notmuch_message_get_message_id (message); + tid = notmuch_message_get_thread_id (message); + notmuch = message->notmuch; +@@ -1059,21 +1062,44 @@ _notmuch_message_delete (notmuch_message_t *message) + + db = static_cast (notmuch->xapian_db); + db->delete_document (message->doc_id); +- +- /* and reintroduce a ghost in its place */ +- ghost = _notmuch_message_create_for_message_id (notmuch, mid, &private_status); +- if (private_status == NOTMUCH_PRIVATE_STATUS_SUCCESS) { +- /* this is deeply weird, and we should not have gotten into +- this state. is there a better error message to return +- here? */ +- return NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; +- } else if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) { +- private_status = _notmuch_message_initialize_ghost (ghost, tid); +- if (! private_status) +- _notmuch_message_sync (ghost); ++ ++ /* if this was a ghost to begin with, we are done */ ++ private_status = _notmuch_message_has_term_st (message, "type", "ghost", &is_ghost); ++ if (private_status) ++ return COERCE_STATUS (private_status, ++ "Error trying to determine whether message was a ghost"); ++ if (is_ghost) ++ return NOTMUCH_STATUS_SUCCESS; ++ ++ query_string = talloc_asprintf (message, "thread:%s", tid); ++ query = notmuch_query_create (notmuch, query_string); ++ if (query == NULL) ++ return NOTMUCH_STATUS_OUT_OF_MEMORY; ++ status = notmuch_query_count_messages_st (query, &count); ++ if (status) { ++ notmuch_query_destroy (query); ++ return status; + } +- notmuch_message_destroy (ghost); +- return COERCE_STATUS (private_status, "Error converting to ghost message"); ++ ++ if (count > 0) { ++ /* reintroduce a ghost in its place because there are still ++ * other active messages in this thread: */ ++ ghost = _notmuch_message_create_for_message_id (notmuch, mid, &private_status); ++ if (private_status == NOTMUCH_PRIVATE_STATUS_SUCCESS) { ++ /* this is deeply weird, and we should not have gotten ++ into this state. is there a better error message to ++ return here? */ ++ status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; ++ } else if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) { ++ private_status = _notmuch_message_initialize_ghost (ghost, tid); ++ if (! private_status) ++ _notmuch_message_sync (ghost); ++ } ++ notmuch_message_destroy (ghost); ++ status = COERCE_STATUS (private_status, "Error converting to ghost message"); ++ } ++ notmuch_query_destroy (query); ++ return status; + } + + /* Transform a blank message into a ghost message. The caller must +-- +2.8.0.rc3 + -- 2.26.2