Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 08:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add OS to app version

Browse Source
This commit is contained in:
Pavel Škoda
2020-10-30 10:53:46 +01:00
committed by Michal Horejsek
parent f888176485
commit 9d50a8cef2
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/config/config.go
View File

@ -21,6 +21,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"github.com/ProtonMail/go-appdir" "github.com/ProtonMail/go-appdir"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
@ -247,3 +248,17 @@ func (c *Config) GetDefaultIMAPPort() int {
func (c *Config) GetDefaultSMTPPort() int { func (c *Config) GetDefaultSMTPPort() int {
return 1025 return 1025
} }
// getAPIOS returns actual operating system.
func (c *Config) getAPIOS() string {
switch os := runtime.GOOS; os {
case "darwin": // nolint: goconst
return "macOS"
case "linux":
return "Linux"
case "windows":
return "Windows"
}
return "Linux"
}

2
pkg/config/pmapi_noprod.go
View File

@ -29,7 +29,7 @@ import (
func (c *Config) GetAPIConfig() *pmapi.ClientConfig { func (c *Config) GetAPIConfig() *pmapi.ClientConfig {
return &pmapi.ClientConfig{ return &pmapi.ClientConfig{
AppVersion: strings.Title(c.appName) + "_" + c.version, AppVersion: c.getAPIOS() + strings.Title(c.appName) + "_" + c.version,
ClientID: c.appName, ClientID: c.appName,
} }
} }

2
pkg/config/pmapi_prod.go
View File

@ -31,7 +31,7 @@ import (
func (c *Config) GetAPIConfig() *pmapi.ClientConfig { func (c *Config) GetAPIConfig() *pmapi.ClientConfig {
return &pmapi.ClientConfig{ return &pmapi.ClientConfig{
AppVersion: strings.Title(c.appName) + "_" + c.version, AppVersion: c.getAPIOS() + strings.Title(c.appName) + "_" + c.version,
ClientID: c.appName, ClientID: c.appName,
Timeout: 25 * time.Minute, // Overall request timeout (~25MB / 25 mins => ~16kB/s, should be reasonable). Timeout: 25 * time.Minute, // Overall request timeout (~25MB / 25 mins => ~16kB/s, should be reasonable).
FirstReadTimeout: 30 * time.Second, // 30s to match 30s response header timeout. FirstReadTimeout: 30 * time.Second, // 30s to match 30s response header timeout.