diff options
| author | Bence Ferdinandy <bence@ferdinandy.com> | 2024-05-30 11:30:19 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2024-06-05 08:41:13 +0200 |
| commit | a5bd99ca7b7e575be7d87fa7882be0b52f6d0261 (patch) | |
| tree | 52a9aad0d484f6351520b7fb9e022f7ff2ab47b4 /commands/account/cf.go | |
| parent | fd35044023b3b6cae4eb95c4f4b997873739b153 (diff) | |
| download | aerc-a5bd99ca7b7e575be7d87fa7882be0b52f6d0261.tar.gz | |
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 <bence@ferdinandy.com>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'commands/account/cf.go')
| -rw-r--r-- | commands/account/cf.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/commands/account/cf.go b/commands/account/cf.go index c6993a23..8762f97f 100644 --- a/commands/account/cf.go +++ b/commands/account/cf.go @@ -2,7 +2,6 @@ package account import ( "errors" - "reflect" "strings" "time" @@ -10,7 +9,6 @@ import ( "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. |