yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

feat(BRIDGE-356): Added retry logic for unavailable preferred keychain on Linux; Feature flag support before bridge initialization; Refactored some bits of the code;

Browse Source
This commit is contained in:
Atanas Janeshliev
2025-07-02 16:34:32 +02:00
parent 20183bf984
commit de3fd34998
33 changed files with 716 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/locations/locations.go
View File

@ -24,6 +24,7 @@ import (
"path/filepath"
"runtime"
"github.com/ProtonMail/proton-bridge/v3/internal/platform"
"github.com/ProtonMail/proton-bridge/v3/pkg/files"
"github.com/sirupsen/logrus"
)
@ -90,7 +91,7 @@ func (l *Locations) getLicenseFilePath() string {
}
switch runtime.GOOS {
case "linux":
case platform.LINUX:
// Most Linux distributions.
path := "/usr/share/doc/protonmail/" + l.configName + "/LICENSE"
if _, err := os.Stat(path); err == nil {
@ -98,7 +99,7 @@ func (l *Locations) getLicenseFilePath() string {
}
// Arch distributions.
return "/usr/share/licenses/protonmail-" + l.configName + "/LICENSE"
case "darwin": //nolint:goconst
case platform.MACOS: //nolint:goconst
path := filepath.Join(filepath.Dir(os.Args[0]), "..", "Resources", "LICENSE")
if _, err := os.Stat(path); err == nil {
return path
@ -109,7 +110,7 @@ func (l *Locations) getLicenseFilePath() string {
// or may not work, depends where user installed the app and how
// user started the app.
return "/Applications/Proton Mail Bridge.app/Contents/Resources/LICENSE"
case "windows":
case platform.WINDOWS:
path := filepath.Join(filepath.Dir(os.Args[0]), "LICENSE.txt")
if _, err := os.Stat(path); err == nil {
return path
@ -206,6 +207,14 @@ func (l *Locations) ProvideUnleashCachePath() (string, error) {
return l.getUnleashCachePath(), nil
}
func (l *Locations) ProvideUnleashStartupCachePath() (string, error) {
if err := os.MkdirAll(l.getUnleashStartupCachePath(), 0o700); err != nil {
return "", err
}
return l.getUnleashStartupCachePath(), nil
}
func (l *Locations) getGluonCachePath() string {
return filepath.Join(l.userData, "gluon")
}
@ -244,6 +253,10 @@ func (l *Locations) getNotificationsCachePath() string {
func (l *Locations) getUnleashCachePath() string { return filepath.Join(l.userCache, "unleash_cache") }
func (l *Locations) getUnleashStartupCachePath() string {
return filepath.Join(l.userCache, "unleash_startup_cache")
}
// Clear removes everything except the lock and update files.
func (l *Locations) Clear(except ...string) error {
return files.Remove(

4
internal/locations/provider.go
View File

@ -22,6 +22,8 @@ import (
"os"
"path/filepath"
"runtime"
"github.com/ProtonMail/proton-bridge/v3/internal/platform"
)
// Provider provides standard locations.
@ -95,7 +97,7 @@ func (p *DefaultProvider) UserCache() string {
// This is necessary because os.UserDataDir() is not implemented by the Go standard library, sadly.
// On non-linux systems, it is the same as os.UserConfigDir().
func userDataDir() (string, error) {
if runtime.GOOS != "linux" {
if runtime.GOOS != platform.LINUX {
return os.UserConfigDir()
}