0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

♻️ 重构版本比较

Browse source
This commit is contained in:
Liang Ding 2022-10-09 16:24:15 +08:00
parent 4638ccb76d
commit 4dd124b88a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
kernel/model/updater.go
View file

@ -106,7 +106,7 @@ func getUpdatePkg() (downloadPkgURL, checksum string, err error) {
installPkgSite := result["installPkg"].(string)
ver := result["ver"].(string)
if ver == util.Ver {
if isVersionUpToDate(ver) {
return
}
@ -216,6 +216,57 @@ func GetAnnouncements() (ret []*Announcement) {
}
return
}
func CheckUpdate(showMsg bool) {
if !showMsg {
return
}
result, err := util.GetRhyResult(showMsg)
if nil != err {
return
}
ver := result["ver"].(string)
release := result["release"].(string)
var msg string
var timeout int
if isVersionUpToDate(ver) {
msg = Conf.Language(10)
timeout = 3000
} else {
msg = fmt.Sprintf(Conf.Language(9), "<a href=\""+release+"\">"+release+"</a>")
showMsg = true
timeout = 15000
}
if showMsg {
util.PushMsg(msg, timeout)
go func() {
checkDownloadInstallPkg()
if "" != getNewVerInstallPkgPath() {
util.PushMsg(Conf.Language(62), 0)
}
}()
}
}
func isVersionUpToDate(releaseVer string) bool {
return ver2num(releaseVer) <= ver2num(util.Ver)
}
func skipNewVerInstallPkg() bool {
if !gulu.OS.IsWindows() && !gulu.OS.IsDarwin() && !gulu.OS.IsLinux() {
return true
}
if util.ISMicrosoftStore {
return true
}
if !Conf.System.DownloadInstallPkg {
return true
}
return false
}
func ver2num(a string) int {
var version string
var suffixpos int
@ -255,49 +306,3 @@ func ver2num(a string) int {
verNum, _ := strconv.Atoi(ver)
return verNum
}
func CheckUpdate(showMsg bool) {
if !showMsg {
return
}
result, err := util.GetRhyResult(showMsg)
if nil != err {
return
}
ver := result["ver"].(string)
release := result["release"].(string)
var msg string
var timeout int
if ver2num(ver) <= ver2num(util.Ver) {
msg = Conf.Language(10)
timeout = 3000
} else {
msg = fmt.Sprintf(Conf.Language(9), "<a href=\""+release+"\">"+release+"</a>")
showMsg = true
timeout = 15000
}
if showMsg {
util.PushMsg(msg, timeout)
go func() {
checkDownloadInstallPkg()
if "" != getNewVerInstallPkgPath() {
util.PushMsg(Conf.Language(62), 0)
}
}()
}
}
func skipNewVerInstallPkg() bool {
if !gulu.OS.IsWindows() && !gulu.OS.IsDarwin() && !gulu.OS.IsLinux() {
return true
}
if util.ISMicrosoftStore {
return true
}
if !Conf.System.DownloadInstallPkg {
return true
}
return false
}