Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other(refactor): Move Locations out of frontend

Browse Source
This commit is contained in:
James Houlahan
2022-08-18 15:51:40 +02:00
committed by Jakub
parent 2aaec3b6bd
commit e4f08f79c3
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/frontend/cli/frontend.go
View File

@ -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,

2
internal/frontend/cli/system.go
View File

@ -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)