From 6fed04bb9fa43d3886d47d0c845d32fff11569b5 Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Thu, 18 Jul 2019 06:25:42 +0200 Subject: Register worker in init. This allows backends which can't always be compiled due to missing dependencies (say libnotmuch) to be compiled conditionally with buildflags. --- worker/worker.go | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'worker/worker.go') diff --git a/worker/worker.go b/worker/worker.go index a37927e..f1f47c3 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -1,14 +1,13 @@ package worker import ( - "git.sr.ht/~sircmpwn/aerc/worker/imap" - "git.sr.ht/~sircmpwn/aerc/worker/maildir" - "git.sr.ht/~sircmpwn/aerc/worker/types" - "fmt" "log" "net/url" "strings" + + "git.sr.ht/~sircmpwn/aerc/worker/handlers" + "git.sr.ht/~sircmpwn/aerc/worker/types" ) // Guesses the appropriate worker type based on the given source string @@ -23,19 +22,10 @@ func NewWorker(source string, logger *log.Logger) (*types.Worker, error) { scheme = scheme[:strings.IndexRune(scheme, '+')] fmt.Println(scheme) } - switch scheme { - case "imap": - fallthrough - case "imaps": - worker.Backend = imap.NewIMAPWorker(worker) - case "maildir": - if w, err := maildir.NewWorker(worker); err != nil { - return nil, fmt.Errorf("could not create maildir worker: %v", err) - } else { - worker.Backend = w - } - default: - return nil, fmt.Errorf("Unknown backend %s", u.Scheme) + backend, err := handlers.GetHandlerForScheme(scheme, worker) + if err != nil { + return nil, err } + worker.Backend = backend return worker, nil } -- cgit v1.2.3