commands: use AccountConfig.Backend instead of reflect

Currently we use a convoluted way based on reflect to check what type of backend a command is running in. Use the new Backend variable available in AccountConfig instead to simplify the logic. Signed-off-by: Bence Ferdinandy <[email protected]> Acked-by: Robin Jarry <[email protected]>
rjarry · Jun 5, 2024 · a5bd99c · a5bd99c
1 parent fd35044
commit a5bd99c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/commands/account/cf.go b/commands/account/cf.go
@@ -2,15 +2,13 @@ package account
 
 import (
 	"errors"
-	"reflect"
 	"strings"
 	"time"
 
 	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/lib/state"
 	"git.sr.ht/~rjarry/aerc/models"
-	"git.sr.ht/~rjarry/aerc/worker/handlers"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 	"git.sr.ht/~rjarry/go-opt"
 )
@@ -62,8 +60,7 @@ func (c *ChangeFolder) CompleteFolderAndNotmuch(arg string) []string {
 			return s
 		},
 	)
-	notmuch, _ := handlers.GetHandlerForScheme("notmuch", new(types.Worker))
-	if reflect.TypeOf(notmuch) == reflect.TypeOf(acct.Worker().Backend) {
+	if acct.AccountConfig().Backend == "notmuch" {
 		notmuchcomps := handleNotmuchComplete(arg)
 		for _, prefix := range notmuch_search_terms {
 			if strings.HasPrefix(arg, prefix) {
@@ -102,8 +99,7 @@ func (c ChangeFolder) Execute([]string) error {
 		return errors.New("<folder> is required. Usage: cf [-a <account>] <folder>")
 	}
 
-	notmuch, _ := handlers.GetHandlerForScheme("notmuch", new(types.Worker))
-	if reflect.TypeOf(notmuch) == reflect.TypeOf(acct.Worker().Backend) {
+	if acct.AccountConfig().Backend == "notmuch" {
 		// With notmuch, :cf can change to a "dynamic folder" that
 		// contains the result of a query. Preserve the entered
 		// arguments verbatim.

diff --git a/commands/account/query.go b/commands/account/query.go
@@ -2,13 +2,11 @@ package account
 
 import (
 	"errors"
-	"reflect"
 	"strings"
 	"time"
 
 	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
-	"git.sr.ht/~rjarry/aerc/worker/handlers"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -50,8 +48,7 @@ func (q Query) Execute([]string) error {
 		}
 	}
 
-	notmuch, _ := handlers.GetHandlerForScheme("notmuch", new(types.Worker))
-	if reflect.TypeOf(notmuch) != reflect.TypeOf(acct.Worker().Backend) {
+	if acct.AccountConfig().Backend != "notmuch" {
 		return errors.New(":query is only available for notmuch accounts")
 	}
 

diff --git a/commands/account/search.go b/commands/account/search.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"net/textproto"
-	"reflect"
 	"strings"
 	"time"
 
@@ -15,7 +14,6 @@ import (
 	"git.sr.ht/~rjarry/aerc/lib/state"
 	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/models"
-	"git.sr.ht/~rjarry/aerc/worker/handlers"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -64,8 +62,7 @@ func (*SearchFilter) CompleteNotmuch(arg string) []string {
 	if acct == nil {
 		return nil
 	}
-	notmuch, _ := handlers.GetHandlerForScheme("notmuch", new(types.Worker))
-	if reflect.TypeOf(notmuch) != reflect.TypeOf(acct.Worker().Backend) {
+	if acct.AccountConfig().Backend != "notmuch" {
 		return nil
 	}
 	return handleNotmuchComplete(arg)