feat: enable autostart to use launcher

go.mod

@@ -49,7 +49,7 @@ require (
 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
 	github.com/hashicorp/go-multierror v1.1.0
 	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
+	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
 	github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/mattn/go-runewidth v0.0.9 // indirect

internal/app/base/base.go

@@ -36,6 +36,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-appdir"
+	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/ProtonMail/proton-bridge/internal/api"
 	"github.com/ProtonMail/proton-bridge/internal/config/cache"
@@ -70,11 +71,12 @@ type Base struct {
 	Updater      *updater.Updater
 	Versioner    *versioner.Versioner
 	TLS          *tls.TLS
+	Autostart    *autostart.App
 
-	name  string
+	Name    string // the app's name
-	usage string
+	usage   string // the app's usage description
-
+	command string // the command used to launch the app (either the exe path or the launcher path)
-	restart bool
+	restart bool   // whether the app is currently set to restart
 }
 
 func New( // nolint[funlen]
@@ -156,8 +158,6 @@ func New( // nolint[funlen]
 
 	sentryReporter.SetUserAgentProvider(cm)
 
-	tls := tls.New(settingsPath)
-
 	key, err := crypto.NewKeyFromArmored(updater.DefaultPublicKey)
 	if err != nil {
 		return nil, err
@@ -174,9 +174,7 @@ func New( // nolint[funlen]
 	}
 
 	versioner := versioner.New(updatesDir)
-
 	installer := updater.NewInstaller(versioner)
-
 	updater := updater.New(
 		cm,
 		installer,
@@ -187,6 +185,19 @@ func New( // nolint[funlen]
 		runtime.GOOS,
 	)
 
+	tls := tls.New(settingsPath)
+
+	exe, err := os.Executable()
+	if err != nil {
+		return nil, err
+	}
+
+	autostart := &autostart.App{
+		Name:        appName,
+		DisplayName: appName,
+		Exec:        []string{exe},
+	}
+
 	return &Base{
 		CrashHandler: crashHandler,
 		Locations:    locations,
@@ -199,16 +210,21 @@ func New( // nolint[funlen]
 		Updater:      updater,
 		Versioner:    versioner,
 		TLS:          tls,
+		Autostart:    autostart,
 
-		name:  appName,
+		Name:  appName,
 		usage: appUsage,
+
+		// By default, the command is the app's executable.
+		// This can be changed at runtime by using the "--launcher" flag.
+		command: exe,
 	}, nil
 }
 
 func (b *Base) NewApp(action func(*Base, *cli.Context) error) *cli.App {
 	app := cli.NewApp()
 
-	app.Name = b.name
+	app.Name = b.Name
 	app.Usage = b.usage
 	app.Version = constants.Version
 	app.Action = b.run(action)
@@ -258,6 +274,12 @@ func (b *Base) run(appMainLoop func(*Base, *cli.Context) error) cli.ActionFunc {
 		defer b.CrashHandler.HandlePanic()
 		defer func() { _ = b.Lock.Close() }()
 
+		// If launcher was used to start the app, use that for restart/autostart.
+		if launcher := c.String("launcher"); launcher != "" {
+			b.Autostart.Exec = []string{launcher}
+			b.command = launcher
+		}
+
 		if doCPUProfile := c.Bool("cpu-prof"); doCPUProfile {
 			startCPUProfile()
 			defer pprof.StopCPUProfile()
@@ -270,7 +292,7 @@ func (b *Base) run(appMainLoop func(*Base, *cli.Context) error) cli.ActionFunc {
 		logging.SetLevel(c.String("log-level"))
 
 		logrus.
-			WithField("appName", b.name).
+			WithField("appName", b.Name).
 			WithField("version", constants.Version).
 			WithField("revision", constants.Revision).
 			WithField("build", constants.BuildTime).
@@ -287,7 +309,7 @@ func (b *Base) run(appMainLoop func(*Base, *cli.Context) error) cli.ActionFunc {
 				return nil
 			}
 
-			return restartApp(c.String("launcher"), true)
+			return b.restartApp(true)
 		})
 
 		if err := appMainLoop(b, c); err != nil {
@@ -295,7 +317,7 @@ func (b *Base) run(appMainLoop func(*Base, *cli.Context) error) cli.ActionFunc {
 		}
 
 		if b.restart {
-			return restartApp(c.String("launcher"), false)
+			return b.restartApp(false)
 		}
 
 		if err := b.Versioner.RemoveOldVersions(); err != nil {

internal/app/base/restart.go

@@ -28,16 +28,7 @@ import (
 // maxAllowedRestarts controls after how many crashes the app will give up restarting.
 const maxAllowedRestarts = 10
 
-func restartApp(path string, crash bool) error {
+func (b *Base) restartApp(crash bool) error {
-	if path == "" {
-		exe, err := os.Executable()
-		if err != nil {
-			return err
-		}
-
-		path = exe
-	}
-
 	var args []string
 
 	if crash {
@@ -47,11 +38,11 @@ func restartApp(path string, crash bool) error {
 	}
 
 	logrus.
-		WithField("path", path).
+		WithField("command", b.command).
 		WithField("args", args).
 		Warn("Restarting")
 
-	return exec.Command(path, args...).Start() // nolint[gosec]
+	return exec.Command(b.command, args...).Start() // nolint[gosec]
 }
 
 // incrementRestartFlag increments the value of the restart flag.

internal/app/bridge/bridge.go

@@ -105,9 +105,13 @@ func run(b *base.Base, c *cli.Context) error { // nolint[funlen]
 		return nil
 	}
 
+	// Bridge supports no-window option which we should use for autostart.
+	b.Autostart.Exec = append(b.Autostart.Exec, "--no-window")
+
 	f := frontend.New(
 		constants.Version,
 		constants.BuildVersion,
+		b.Name,
 		frontendMode,
 		!c.Bool("no-window"),
 		b.CrashHandler,
@@ -117,6 +121,7 @@ func run(b *base.Base, c *cli.Context) error { // nolint[funlen]
 		b.Updater,
 		bridge,
 		smtpBackend,
+		b.Autostart,
 		b,
 	)
 

internal/app/ie/ie.go

@@ -57,6 +57,7 @@ func run(b *base.Base, c *cli.Context) error {
 	f := frontend.NewImportExport(
 		constants.Version,
 		constants.BuildVersion,
+		b.Name,
 		frontendMode,
 		b.CrashHandler,
 		b.Locations,

internal/frontend/frontend.go

@@ -19,6 +19,7 @@
 package frontend
 
 import (
+	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/cli"
@@ -49,6 +50,7 @@ type Frontend interface {
 func New(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
@@ -58,12 +60,14 @@ func New(
 	updater types.Updater,
 	bridge *bridge.Bridge,
 	noEncConfirmator types.NoEncConfirmator,
+	autostart *autostart.App,
 	restarter types.Restarter,
 ) Frontend {
 	bridgeWrap := types.NewBridgeWrap(bridge)
 	return newBridgeFrontend(
 		version,
 		buildVersion,
+		programName,
 		frontendType,
 		showWindowOnStart,
 		panicHandler,
@@ -73,6 +77,7 @@ func New(
 		updater,
 		bridgeWrap,
 		noEncConfirmator,
+		autostart,
 		restarter,
 	)
 }
@@ -80,6 +85,7 @@ func New(
 func newBridgeFrontend(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
@@ -89,6 +95,7 @@ func newBridgeFrontend(
 	updater types.Updater,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
+	autostart *autostart.App,
 	restarter types.Restarter,
 ) Frontend {
 	switch frontendType {
@@ -106,6 +113,7 @@ func newBridgeFrontend(
 		return qt.New(
 			version,
 			buildVersion,
+			programName,
 			showWindowOnStart,
 			panicHandler,
 			locations,
@@ -114,6 +122,7 @@ func newBridgeFrontend(
 			updater,
 			bridge,
 			noEncConfirmator,
+			autostart,
 			restarter,
 		)
 	}
@@ -123,6 +132,7 @@ func newBridgeFrontend(
 func NewImportExport(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	panicHandler types.PanicHandler,
 	locations *locations.Locations,
@@ -136,6 +146,7 @@ func NewImportExport(
 	return newIEFrontend(
 		version,
 		buildVersion,
+		programName,
 		frontendType,
 		panicHandler,
 		locations,
@@ -150,6 +161,7 @@ func NewImportExport(
 func newIEFrontend(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	panicHandler types.PanicHandler,
 	locations *locations.Locations,
@@ -173,6 +185,7 @@ func newIEFrontend(
 		return qtie.New(
 			version,
 			buildVersion,
+			programName,
 			panicHandler,
 			locations,
 			settings,

internal/frontend/qt-ie/frontend.go

@@ -62,7 +62,7 @@ type FrontendQt struct {
 	Qml      *GoQMLInterface            // Object accessible from both Go and QML for methods and signals
 	Accounts qtcommon.Accounts          // Providing data for accounts ListView
 
-	programName    string // Program name
+	programName    string // App name
 	programVersion string // Program version
 	buildVersion   string // Program build version
 
@@ -80,7 +80,7 @@ type FrontendQt struct {
 
 // New is constructor for Import-Export Qt-Go interface
 func New(
-	version, buildVersion string,
+	version, buildVersion, programName string,
 	panicHandler types.PanicHandler,
 	locations *locations.Locations,
 	settings *settings.Settings,
@@ -93,7 +93,7 @@ func New(
 		panicHandler:   panicHandler,
 		locations:      locations,
 		settings:       settings,
-		programName:    "ProtonMail Import-Export",
+		programName:    programName,
 		programVersion: "v" + version,
 		eventListener:  eventListener,
 		updater:        updater,

internal/frontend/qt-ie/frontend_nogui.go

@@ -54,7 +54,7 @@ func (s *FrontendHeadless) NotifySilentUpdateError(err error) {
 }
 
 func New(
-	version, buildVersion string,
+	version, buildVersion, appName string,
 	panicHandler types.PanicHandler,
 	locations *locations.Locations,
 	settings *settings.Settings,

internal/frontend/qt/frontend.go

@@ -49,7 +49,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/ProtonMail/proton-bridge/pkg/ports"
 	"github.com/ProtonMail/proton-bridge/pkg/useragent"
-	"github.com/kardianos/osext"
 	"github.com/sirupsen/logrus"
 	"github.com/skratchdot/open-golang/open"
 	"github.com/therecipe/qt/core"
@@ -68,6 +67,7 @@ var accountMutex = &sync.Mutex{}
 type FrontendQt struct {
 	version           string
 	buildVersion      string
+	programName       string
 	showWindowOnStart bool
 	panicHandler      types.PanicHandler
 	locations         *locations.Locations
@@ -77,19 +77,18 @@ type FrontendQt struct {
 	bridge            types.Bridger
 	noEncConfirmator  types.NoEncConfirmator
 
-	App         *widgets.QApplication      // Main Application pointer.
+	App        *widgets.QApplication      // Main Application pointer.
-	View        *qml.QQmlApplicationEngine // QML engine pointer.
+	View       *qml.QQmlApplicationEngine // QML engine pointer.
-	MainWin     *core.QObject              // Pointer to main window inside QML.
+	MainWin    *core.QObject              // Pointer to main window inside QML.
-	Qml         *GoQMLInterface            // Object accessible from both Go and QML for methods and signals.
+	Qml        *GoQMLInterface            // Object accessible from both Go and QML for methods and signals.
-	Accounts    *AccountsModel             // Providing data for  accounts ListView.
+	Accounts   *AccountsModel             // Providing data for  accounts ListView.
-	programName string                     // Program name (shown in taskbar).
+	programVer string                     // Program version (shown in help).
-	programVer  string                     // Program version (shown in help).
 
 	authClient pmapi.Client
 
 	auth *pmapi.Auth
 
-	AutostartEntry *autostart.App
+	autostart *autostart.App
 
 	// expand userID when added
 	userIDAdded string
@@ -103,7 +102,8 @@ type FrontendQt struct {
 // New returns a new Qt frontend for the bridge.
 func New(
 	version,
-	buildVersion string,
+	buildVersion,
+	programName string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
 	locations *locations.Locations,
@@ -112,12 +112,13 @@ func New(
 	updater types.Updater,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
+	autostart *autostart.App,
 	restarter types.Restarter,
 ) *FrontendQt {
-	prgName := "ProtonMail Bridge"
 	tmp := &FrontendQt{
 		version:           version,
 		buildVersion:      buildVersion,
+		programName:       programName,
 		showWindowOnStart: showWindowOnStart,
 		panicHandler:      panicHandler,
 		locations:         locations,
@@ -126,24 +127,9 @@ func New(
 		updater:           updater,
 		bridge:            bridge,
 		noEncConfirmator:  noEncConfirmator,
-
+		programVer:        "v" + version,
-		programName: prgName,
+		autostart:         autostart,
-		programVer:  "v" + version,
+		restarter:         restarter,
-		AutostartEntry: &autostart.App{
-			Name:        prgName,
-			DisplayName: prgName,
-			Exec:        []string{"", "--no-window"},
-		},
-
-		restarter: restarter,
-	}
-
-	// Handle autostart if wanted.
-	if p, err := osext.Executable(); err == nil {
-		tmp.AutostartEntry.Exec[0] = p
-		log.Info("Autostart ", p)
-	} else {
-		log.Error("Cannot get current executable path: ", err)
 	}
 
 	// Nicer string for OS.
@@ -344,15 +330,15 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error {
 
 	// Autostart.
 	if s.Qml.IsFirstStart() {
-		if s.AutostartEntry.IsEnabled() {
+		if s.autostart.IsEnabled() {
-			if err := s.AutostartEntry.Disable(); err != nil {
+			if err := s.autostart.Disable(); err != nil {
 				log.Error("First disable ", err)
 				s.autostartError(err)
 			}
 		}
 		s.toggleAutoStart()
 	}
-	if s.AutostartEntry.IsEnabled() {
+	if s.autostart.IsEnabled() {
 		s.Qml.SetIsAutoStart(true)
 	} else {
 		s.Qml.SetIsAutoStart(false)
@@ -526,16 +512,16 @@ func (s *FrontendQt) configureAppleMail(iAccount, iAddress int) {
 func (s *FrontendQt) toggleAutoStart() {
 	defer s.Qml.ProcessFinished()
 	var err error
-	if s.AutostartEntry.IsEnabled() {
+	if s.autostart.IsEnabled() {
-		err = s.AutostartEntry.Disable()
+		err = s.autostart.Disable()
 	} else {
-		err = s.AutostartEntry.Enable()
+		err = s.autostart.Enable()
 	}
 	if err != nil {
 		log.Error("Enable autostart: ", err)
 		s.autostartError(err)
 	}
-	if s.AutostartEntry.IsEnabled() {
+	if s.autostart.IsEnabled() {
 		s.Qml.SetIsAutoStart(true)
 	} else {
 		s.Qml.SetIsAutoStart(false)

internal/frontend/qt/frontend_nogui.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
 	"github.com/ProtonMail/proton-bridge/internal/locations"
@@ -57,7 +58,7 @@ func (s *FrontendHeadless) InstanceExistAlert() {}
 
 func New(
 	version,
-	buildVersion string,
+	buildVersion, appName string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
 	locations *locations.Locations,
@@ -66,6 +67,7 @@ func New(
 	updater types.Updater,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
+	autostart *autostart.App,
 	restarter types.Restarter,
 ) *FrontendHeadless {
 	return &FrontendHeadless{}