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

GODT-1977: revert the pre-release changes.

Browse Source
This commit is contained in:
Jakub
2022-11-08 18:11:17 +01:00
committed by James Houlahan
parent 5aa495b240
commit bbbc18b959
4 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/launcher/main.go
View File

@ -241,7 +241,7 @@ func getPathToUpdatedExecutable(
} }
// Skip versions that are less or equal to launcher version. // Skip versions that are less or equal to launcher version.
if currentVersion != nil && !versioner.IsNewerIgnorePrerelease(version.SemVer(), currentVersion) { if currentVersion != nil && !version.SemVer().GreaterThan(currentVersion) {
continue continue
} }

7
internal/bridge/updates.go
View File

@ -24,7 +24,6 @@ import (
"github.com/ProtonMail/proton-bridge/v2/internal/events" "github.com/ProtonMail/proton-bridge/v2/internal/events"
"github.com/ProtonMail/proton-bridge/v2/internal/safe" "github.com/ProtonMail/proton-bridge/v2/internal/safe"
"github.com/ProtonMail/proton-bridge/v2/internal/updater" "github.com/ProtonMail/proton-bridge/v2/internal/updater"
"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -60,7 +59,7 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) {
}) })
switch { switch {
case !versioner.IsNewerIgnorePrerelease(version.Version, bridge.curVersion): case !version.Version.GreaterThan(bridge.curVersion):
log.Debug("No update available") log.Debug("No update available")
bridge.publish(events.UpdateNotAvailable{}) bridge.publish(events.UpdateNotAvailable{})
@ -70,7 +69,7 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) {
bridge.publish(events.UpdateNotAvailable{}) bridge.publish(events.UpdateNotAvailable{})
case versioner.IsNewerIgnorePrerelease(version.MinAuto, bridge.curVersion): case bridge.curVersion.LessThan(version.MinAuto):
log.Info("An update is available but is incompatible with this version") log.Info("An update is available but is incompatible with this version")
bridge.publish(events.UpdateAvailable{ bridge.publish(events.UpdateAvailable{
@ -90,7 +89,7 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) {
default: default:
safe.RLock(func() { safe.RLock(func() {
if versioner.IsNewerIgnorePrerelease(version.Version, bridge.newVersion) { if version.Version.GreaterThan(bridge.newVersion) {
log.Info("An update is available") log.Info("An update is available")
select { select {

7
internal/versioner/versioner.go
View File

@ -84,10 +84,3 @@ func getExecutableInDirectory(name, directory string) (string, error) {
return exe, nil return exe, nil
} }
func IsNewerIgnorePrerelease(a, b *semver.Version) bool {
aN, _ := a.SetPrerelease("")
bN, _ := b.SetPrerelease("")
return aN.GreaterThan(&bN)
}

15
internal/versioner/versioner_test.go
View File

@ -27,21 +27,6 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func TestIsNewerIgnorePrelease(t *testing.T) {
// older
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.1")))
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0")))
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0+qa")))
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0-dev")))
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.5.0-dev+qa")))
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0+qa"), semver.MustParse("2.5.0-dev")))
assert.False(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0-dev"), semver.MustParse("2.5.0+qa")))
// not older
assert.True(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0"), semver.MustParse("2.4.9-dev+qa")))
assert.True(t, IsNewerIgnorePrerelease(semver.MustParse("2.5.0-dev+qa"), semver.MustParse("2.4.9")))
}
func TestListVersions(t *testing.T) { func TestListVersions(t *testing.T) {
dir := t.TempDir() dir := t.TempDir()