yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-2291: Change gluon store default location from Cache to Data.

Browse Source
This commit is contained in:
Romain Le Jeune
2023-01-24 13:35:45 +00:00
parent 5a70a16149
commit ee4da8a89c
9 changed files with 32 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/bridge/bridge.go
View File

@ -221,14 +221,14 @@ func newBridge(
return nil, fmt.Errorf("failed to get Gluon directory: %w", err)
}
gluonConfigDir, err := locator.ProvideGluonConfigPath()
gluonDataDir, err := locator.ProvideGluonDataPath()
if err != nil {
return nil, fmt.Errorf("failed to get Gluon Database directory: %w", err)
}
imapServer, err := newIMAPServer(
gluonCacheDir,
gluonConfigDir,
gluonDataDir,
curVersion,
tlsConfig,
reporter,

6
internal/bridge/bridge_test.go
View File

@ -385,7 +385,7 @@ func TestBridge_MissingGluonDatabase(t *testing.T) {
require.NoError(t, err)
// Get the gluon dir.
gluonDir, err = bridge.GetGluonConfigDir()
gluonDir, err = bridge.GetGluonDataDir()
require.NoError(t, err)
})
@ -484,7 +484,7 @@ func TestBridge_FactoryReset(t *testing.T) {
func TestBridge_InitGluonDirectory(t *testing.T) {
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, vaultKey []byte) {
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
configDir, err := b.GetGluonConfigDir()
configDir, err := b.GetGluonDataDir()
require.NoError(t, err)
_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
@ -511,7 +511,7 @@ func TestBridge_ChangeCacheDirectory(t *testing.T) {
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
newCacheDir := t.TempDir()
currentCacheDir := b.GetGluonCacheDir()
configDir, err := b.GetGluonConfigDir()
configDir, err := b.GetGluonDataDir()
require.NoError(t, err)
// Login the user.

8
internal/bridge/settings.go
View File

@ -119,8 +119,8 @@ func (bridge *Bridge) GetGluonCacheDir() string {
return bridge.vault.GetGluonCacheDir()
}
func (bridge *Bridge) GetGluonConfigDir() (string, error) {
return bridge.locator.ProvideGluonConfigPath()
func (bridge *Bridge) GetGluonDataDir() (string, error) {
return bridge.locator.ProvideGluonDataPath()
}
func (bridge *Bridge) SetGluonDir(ctx context.Context, newGluonDir string) error {
@ -148,14 +148,14 @@ func (bridge *Bridge) SetGluonDir(ctx context.Context, newGluonDir string) error
}
}
gluonDBDir, err := bridge.GetGluonConfigDir()
gluonDataDir, err := bridge.GetGluonDataDir()
if err != nil {
panic(fmt.Errorf("failed to get Gluon Database directory: %w", err))
}
imapServer, err := newIMAPServer(
bridge.vault.GetGluonCacheDir(),
gluonDBDir,
gluonDataDir,
bridge.curVersion,
bridge.tlsConfig,
bridge.reporter,

2
internal/bridge/types.go
View File

@ -27,7 +27,7 @@ type Locator interface {
ProvideSettingsPath() (string, error)
ProvideLogsPath() (string, error)
ProvideGluonCachePath() (string, error)
ProvideGluonConfigPath() (string, error)
ProvideGluonDataPath() (string, error)
GetLicenseFilePath() string
GetDependencyLicensesLink() string
Clear() error