Other(refactor): Move Locations out of frontend

internal/app/bridge/bridge.go

@@ -158,7 +158,6 @@ func main(b *base.Base, c *cli.Context) error { //nolint:funlen
 		frontendMode,
 		!c.Bool(base.FlagNoWindow),
 		b.CrashHandler,
-		b.Locations,
 		b.Settings,
 		b.Listener,
 		b.Updater,

internal/bridge/bridge_locations.go

@@ -0,0 +1,13 @@
+package bridge
+
+func (bridge *Bridge) ProvideLogsPath() (string, error) {
+	panic("TODO")
+}
+
+func (bridge *Bridge) GetLicenseFilePath() string {
+	panic("TODO")
+}
+
+func (bridge *Bridge) GetDependencyLicensesLink() string {
+	panic("TODO")
+}

internal/frontend/cli/frontend.go

@@ -22,7 +22,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/v2/internal/events"
 	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
 	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 
@@ -35,7 +34,6 @@ var log = logrus.WithField("pkg", "frontend/cli") //nolint:gochecknoglobals
 type frontendCLI struct {
 	*ishell.Shell
 
-	locations     *locations.Locations
 	settings      *settings.Settings
 	eventListener listener.Listener
 	updater       types.Updater
@@ -48,7 +46,6 @@ type frontendCLI struct {
 func New( //nolint:funlen
 	panicHandler types.PanicHandler,
 
-	locations *locations.Locations,
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
@@ -58,7 +55,6 @@ func New( //nolint:funlen
 	fe := &frontendCLI{
 		Shell: ishell.New(),
 
-		locations:     locations,
 		settings:      settings,
 		eventListener: eventListener,
 		updater:       updater,

internal/frontend/cli/system.go

@@ -39,7 +39,7 @@ func (f *frontendCLI) restart(c *ishell.Context) {
 }
 
 func (f *frontendCLI) printLogDir(c *ishell.Context) {
-	if path, err := f.locations.ProvideLogsPath(); err != nil {
+	if path, err := f.bridge.ProvideLogsPath(); err != nil {
 		f.Println("Failed to determine location of log files")
 	} else {
 		f.Println("Log files are stored in\n\n ", path)

internal/frontend/frontend.go

@@ -25,7 +25,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/cli"
 	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/grpc"
 	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
 	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 )
@@ -44,7 +43,6 @@ func New(
 	frontendType string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
-	locations *locations.Locations,
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
@@ -59,7 +57,6 @@ func New(
 		return grpc.NewService(
 			showWindowOnStart,
 			panicHandler,
-			locations,
 			settings,
 			eventListener,
 			updater,
@@ -72,13 +69,13 @@ func New(
 	case "cli":
 		return cli.New(
 			panicHandler,
-			locations,
 			settings,
 			eventListener,
 			updater,
 			bridgeWrap,
 			restarter,
 		)
+
 	default:
 		return nil
 	}

internal/frontend/grpc/service.go

@@ -31,7 +31,6 @@ import (
 	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/v2/internal/events"
 	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
 	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 	"github.com/ProtonMail/proton-bridge/v2/internal/users"
 	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
@@ -52,7 +51,6 @@ type Service struct { // nolint:structcheck
 	eventStreamDoneCh chan struct{}
 
 	panicHandler       types.PanicHandler
-	locations          *locations.Locations
 	settings           *settings.Settings
 	eventListener      listener.Listener
 	updater            types.Updater
@@ -75,7 +73,6 @@ type Service struct { // nolint:structcheck
 func NewService(
 	showOnStartup bool,
 	panicHandler types.PanicHandler,
-	locations *locations.Locations,
 	settings *settings.Settings,
 	eventListener listener.Listener,
 	updater types.Updater,
@@ -88,7 +85,6 @@ func NewService(
 	s := Service{
 		UnimplementedBridgeServer: UnimplementedBridgeServer{},
 		panicHandler:              panicHandler,
-		locations:                 locations,
 		settings:                  settings,
 		eventListener:             eventListener,
 		updater:                   updater,

internal/frontend/grpc/service_methods.go

@@ -205,7 +205,7 @@ func (s *Service) Version(context.Context, *emptypb.Empty) (*wrapperspb.StringVa
 
 func (s *Service) LogsPath(context.Context, *emptypb.Empty) (*wrapperspb.StringValue, error) {
 	s.log.Info("LogsPath")
-	path, err := s.locations.ProvideLogsPath()
+	path, err := s.bridge.ProvideLogsPath()
 	if err != nil {
 		s.log.WithError(err).Error("Cannot determine logs path")
 		return nil, err
@@ -215,11 +215,11 @@ func (s *Service) LogsPath(context.Context, *emptypb.Empty) (*wrapperspb.StringV
 
 func (s *Service) LicensePath(context.Context, *emptypb.Empty) (*wrapperspb.StringValue, error) {
 	s.log.Info("LicensePath")
-	return wrapperspb.String(s.locations.GetLicenseFilePath()), nil
+	return wrapperspb.String(s.bridge.GetLicenseFilePath()), nil
 }
 
 func (s *Service) DependencyLicensesLink(context.Context, *emptypb.Empty) (*wrapperspb.StringValue, error) {
-	return wrapperspb.String(s.locations.GetDependencyLicensesLink()), nil
+	return wrapperspb.String(s.bridge.GetDependencyLicensesLink()), nil
 }
 
 func (s *Service) ReleaseNotesPageLink(context.Context, *emptypb.Empty) (*wrapperspb.StringValue, error) {

internal/frontend/types/types.go

@@ -81,6 +81,10 @@ type Bridger interface {
 
 	GetTLSConfig() (*tls.Config, error)
 
+	ProvideLogsPath() (string, error)
+	GetLicenseFilePath() string
+	GetDependencyLicensesLink() string
+
 	// -- old --
 
 	ReportBug(osType, osVersion, description, accountName, address, emailClient string, attachLogs bool) error