From 3a614e45fce9b505bb7e17a31eabffcc5e2d9022 Mon Sep 17 00:00:00 2001
From: Tim Culverhouse <tim@timculverhouse.com>
Date: Tue, 5 Jul 2022 14:48:38 -0500
Subject: [PATCH] threading: enable toggle-threads for server-side threads
Enable the :toggle-threads command to work for workers which have Thread
capability. The implementation of that feature has the side effect that
the threading-enabled config option now sets the default view (threaded
or not threaded) for any worker, not just IMAP or notmuch.
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
---
commands/msg/toggle-threads.go | 4 ++--
config/aerc.conf | 6 ++----
doc/aerc-config.5.scd | 11 ++---------
lib/msgstore.go | 36 ++++++++++++++++++++--------------
widgets/msglist.go | 2 +-
5 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/commands/msg/toggle-threads.go b/commands/msg/toggle-threads.go
index ac4242b..aa0e655 100644
--- a/commands/msg/toggle-threads.go
+++ b/commands/msg/toggle-threads.go
@@ -35,8 +35,8 @@ func (ToggleThreads) Execute(aerc *widgets.Aerc, args []string) error {
return err
}
defer store.Reselect(store.Selected())
- store.SetBuildThreads(!store.BuildThreads())
- acct.SetStatus(statusline.Threading(store.BuildThreads()))
+ store.SetThreadedView(!store.ThreadedView())
+ acct.SetStatus(statusline.Threading(store.ThreadedView()))
acct.Messages().Invalidate()
return nil
}
diff --git a/config/aerc.conf b/config/aerc.conf
index 2f7597c..8e503f5 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -168,10 +168,8 @@ completion-popovers=true
#[ui:account=foo]
#
-# Enable threading in the ui. Only works with notmuch:// and imap:// accounts
-# (when the server supports it). If this is not supported by the server,
-# you can enable it on the fly by issuing the :toggle-threads command. The
-# threading will be done client side instead of on the server.
+# Enable a threaded view of messages. If this is not supported by the backend
+# (IMAP server or notmuch), threads will be built by the client.
#
# Default: false
#threading-enabled=false
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 518fe51..a9d0cd9 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -295,15 +295,8 @@ These options are configured in the *[ui]* section of aerc.conf.
need not be consecutive characters in the command or option.
*threading-enabled*
- Enable a threaded viewing of messages, works with IMAP (when there's
- server support) and NotMuch backends.
-
- This option should only be set to true for specific accounts
- accordingly. See *Contextual UI Configuration* below.
-
- If this is not supported by the server, you can enable it on the fly by
- issuing the _:toggle-threads_ command. The threading will be done client
- side instead of on the server.
+ Enable a threaded view of messages. If this is not supported by the
+ backend (IMAP server or notmuch), threads will be built by the client.
Default: false
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 8808965..0eb5682 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -38,7 +38,7 @@ type MessageStore struct {
sortCriteria []*types.SortCriterion
- thread bool
+ threadedView bool
buildThreads bool
builder *ThreadBuilder
@@ -66,6 +66,11 @@ func NewMessageStore(worker *types.Worker,
dirInfoUpdateDelay := 5 * time.Second
+ var clientThreads bool
+ if !dirInfo.Caps.Thread {
+ clientThreads = true
+ }
+
return &MessageStore{
Deleted: make(map[uint32]interface{}),
DirInfo: *dirInfo,
@@ -76,7 +81,8 @@ func NewMessageStore(worker *types.Worker,
bodyCallbacks: make(map[uint32][]func(*types.FullMessage)),
headerCallbacks: make(map[uint32][]func(*types.MessageInfo)),
- thread: thread,
+ threadedView: thread,
+ buildThreads: clientThreads,
sortCriteria: defaultSortCriteria,
@@ -361,22 +367,22 @@ func (store *MessageStore) update() {
}
}
-func (store *MessageStore) SetBuildThreads(buildThreads bool) {
- // if worker provides threading, don't build our own threads
- if store.thread {
+func (store *MessageStore) SetThreadedView(thread bool) {
+ store.threadedView = thread
+ if store.buildThreads {
+ if store.threadedView {
+ store.runThreadBuilder()
+ }
return
}
- store.buildThreads = buildThreads
- if store.BuildThreads() {
- store.runThreadBuilder()
- }
+ store.Sort(store.sortCriteria, nil)
+}
+
+func (store *MessageStore) ThreadedView() bool {
+ return store.threadedView
}
func (store *MessageStore) BuildThreads() bool {
- // if worker provides threading, don't build our own threads
- if store.thread {
- return false
- }
return store.buildThreads
}
@@ -486,7 +492,7 @@ func (store *MessageStore) Answered(uids []uint32, answered bool,
func (store *MessageStore) Uids() []uint32 {
- if store.BuildThreads() && store.builder != nil {
+ if store.ThreadedView() && store.builder != nil {
if uids := store.builder.Uids(); len(uids) > 0 {
return uids
}
@@ -802,7 +808,7 @@ func (store *MessageStore) Sort(criteria []*types.SortCriterion, cb func()) {
}
}
- if store.thread {
+ if store.threadedView && !store.buildThreads {
store.worker.PostAction(&types.FetchDirectoryThreaded{
SortCriteria: criteria,
}, handle_return)
diff --git a/widgets/msglist.go b/widgets/msglist.go
index 399ed72..9e68f21 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -88,7 +88,7 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
row int = 0
)
- if uiConfig.ThreadingEnabled || store.BuildThreads() {
+ if store.ThreadedView() {
threads := store.Threads
counter := len(store.Uids())