From f4c05908afc0a3af7b08821fda086d3ab48d87a2 Mon Sep 17 00:00:00 2001 From: Lukasz Janyst Date: Tue, 3 May 2022 10:35:55 +0200 Subject: [PATCH] cleanup: Make peroxide use the refactored bridge API Issue #6 --- cmd/peroxide/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/peroxide/main.go b/cmd/peroxide/main.go index b049300..95b23ba 100644 --- a/cmd/peroxide/main.go +++ b/cmd/peroxide/main.go @@ -20,8 +20,7 @@ package main import ( "flag" - "github.com/ljanyst/peroxide/pkg/app/base" - "github.com/ljanyst/peroxide/pkg/app/bridge" + "github.com/ljanyst/peroxide/pkg/bridge" "github.com/ljanyst/peroxide/pkg/files" "github.com/sirupsen/logrus" ) @@ -31,12 +30,14 @@ var config = flag.String("config", files.ExpandTilde("~/.config/protonmail/bridg func main() { flag.Parse() - base, err := base.New(*config) + b := &bridge.Bridge{} + + err := b.Configure(*config) if err != nil { - logrus.WithError(err).Fatal("Failed to create app base") + logrus.WithError(err).Fatal("Failed to configure the bridge") } - if bridge.MailLoop(base); err != nil { + if b.Run(); err != nil { logrus.WithError(err).Fatal("Bridge exited with error") } }