From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 72B8F6DE022E for ; Fri, 20 Jul 2018 16:38:29 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[AWL=0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] 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 XlVgKFbY5-1h for ; Fri, 20 Jul 2018 16:38:27 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id C90096DE0240 for ; Fri, 20 Jul 2018 16:38:25 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1fgeye-00025C-Fm; Fri, 20 Jul 2018 19:38:24 -0400 Received: (nullmailer pid 2985 invoked by uid 1000); Fri, 20 Jul 2018 23:37:52 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 8/9] lib/thread: rewrite _parent_or_toplevel to use depths Date: Sat, 21 Jul 2018 08:37:45 +0900 Message-Id: <20180720233746.2844-9-david@tethera.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720233746.2844-1-david@tethera.net> References: <20180720233746.2844-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 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: Fri, 20 Jul 2018 23:38:29 -0000 This is part 1/2 of changing the reparenting of alleged toplevel messages to use a "deep" reference rather than just the first one found. --- lib/thread.cc | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/lib/thread.cc b/lib/thread.cc index 417235ea..2eed724b 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -409,20 +409,40 @@ _parent_via_in_reply_to (notmuch_thread_t *thread, notmuch_message_t *message) { static void _parent_or_toplevel (notmuch_thread_t *thread, notmuch_message_t *message) { - bool found = false; + size_t max_depth = 0; + notmuch_message_t *new_parent; notmuch_message_t *parent = NULL; const notmuch_string_list_t *references = _notmuch_message_get_references (message); + + DEBUG_PRINTF("trying to reparent via references: %s\n", + notmuch_message_get_message_id (message)); + for (notmuch_string_node_t *ref_node = references->head; - ! found && ref_node; ref_node = ref_node->next) { - if ((found = g_hash_table_lookup_extended (thread->message_hash, - ref_node->string, NULL, - (void **) &parent))) { - _notmuch_message_add_reply (parent, message); + ref_node; ref_node = ref_node->next) { + DEBUG_PRINTF("checking reference=%s\n", ref_node->string); + if ((g_hash_table_lookup_extended (thread->message_hash, + ref_node->string, NULL, + (void **) &new_parent))) { + size_t new_depth = _notmuch_message_get_thread_depth (new_parent); + DEBUG_PRINTF("got depth %lu\n", new_depth); + if (new_depth > max_depth || !parent) { + DEBUG_PRINTF("adding at depth %lu parent=%s\n", new_depth, ref_node->string); + max_depth = new_depth; + parent = new_parent; + } } } - if (! found) + if (parent) { + DEBUG_PRINTF("adding reply %s to parent=%s\n", + notmuch_message_get_message_id (message), + notmuch_message_get_message_id (parent)); + _notmuch_message_add_reply (parent, message); + } else { + DEBUG_PRINTF("adding as toplevel %s\n", + notmuch_message_get_message_id (message)); _notmuch_message_list_add_message (thread->toplevel_list, message); + } } static void -- 2.18.0