daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix minor issues

Browse Source
This commit is contained in:
Andrey Meshkov
2020-07-22 20:27:20 +03:00
parent e3ea2528be
commit 6d5d183311
5 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
update/check.go
View File

@@ -11,15 +11,14 @@ const versionCheckPeriod = 8 * 60 * 60
// VersionInfo - VersionInfo
type VersionInfo struct {
NewVersion string
Announcement string
AnnouncementURL string
SelfUpdateMinVersion string
CanAutoUpdate bool
PackageURL string
NewVersion string // New version string
Announcement string // Announcement text
AnnouncementURL string // Announcement URL
SelfUpdateMinVersion string // Min version starting with which we can auto-update
CanAutoUpdate bool // If true - we can auto-update
}
// GetVersionResponse - GetVersionResponse
// GetVersionResponse - downloads version.json (if needed) and deserializes it
func (u *Updater) GetVersionResponse(forceRecheck bool) (VersionInfo, error) {
if !forceRecheck &&
u.versionCheckLastTime.Unix()+versionCheckPeriod > time.Now().Unix() {
@@ -63,8 +62,8 @@ func (u *Updater) parseVersionResponse(data []byte) (VersionInfo, error) {
return info, fmt.Errorf("version.json: invalid data")
}
var ok bool
info.PackageURL, ok = u.getDownloadURL(versionJSON)
packageURL, ok := u.getDownloadURL(versionJSON)
if ok &&
info.NewVersion != u.VersionString &&
u.VersionString >= info.SelfUpdateMinVersion {
@@ -72,7 +71,7 @@ func (u *Updater) parseVersionResponse(data []byte) (VersionInfo, error) {
}
u.NewVersion = info.NewVersion
u.PackageURL = info.PackageURL
u.PackageURL = packageURL
return info, nil
}