From 05fc1a8ed134bd9e8a8103a25c6132be2a6093e3 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 30 Aug 2023 20:46:00 +0800 Subject: [PATCH] :bug: The update button is not displayed after the marketplace package version is updated Fix https://github.com/siyuan-note/siyuan/issues/9074 --- kernel/bazaar/package.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index d3329868a..6ebffddd1 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -19,7 +19,6 @@ package bazaar import ( "bytes" "errors" - "golang.org/x/mod/semver" "os" "path/filepath" "strings" @@ -34,6 +33,7 @@ import ( "github.com/siyuan-note/httpclient" "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/util" + "golang.org/x/mod/semver" textUnicode "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" ) @@ -390,7 +390,7 @@ func isOutdatedTheme(theme *Theme, bazaarThemes []*Theme) bool { } for _, pkg := range bazaarThemes { - if theme.URL == pkg.URL && theme.Name == pkg.Name && theme.Author == pkg.Author && theme.Version < pkg.Version { + if theme.URL == pkg.URL && theme.Name == pkg.Name && theme.Author == pkg.Author && 0 > semver.Compare("v"+theme.Version, "v"+pkg.Version) { theme.RepoHash = pkg.RepoHash return true } @@ -410,7 +410,7 @@ func isOutdatedIcon(icon *Icon, bazaarIcons []*Icon) bool { } for _, pkg := range bazaarIcons { - if icon.URL == pkg.URL && icon.Name == pkg.Name && icon.Author == pkg.Author && icon.Version < pkg.Version { + if icon.URL == pkg.URL && icon.Name == pkg.Name && icon.Author == pkg.Author && 0 > semver.Compare("v"+icon.Version, "v"+pkg.Version) { icon.RepoHash = pkg.RepoHash return true } @@ -430,7 +430,7 @@ func isOutdatedPlugin(plugin *Plugin, bazaarPlugins []*Plugin) bool { } for _, pkg := range bazaarPlugins { - if plugin.URL == pkg.URL && plugin.Name == pkg.Name && plugin.Author == pkg.Author && plugin.Version < pkg.Version { + if plugin.URL == pkg.URL && plugin.Name == pkg.Name && plugin.Author == pkg.Author && 0 > semver.Compare("v"+plugin.Version, "v"+pkg.Version) { plugin.RepoHash = pkg.RepoHash return true } @@ -450,7 +450,7 @@ func isOutdatedWidget(widget *Widget, bazaarWidgets []*Widget) bool { } for _, pkg := range bazaarWidgets { - if widget.URL == pkg.URL && widget.Name == pkg.Name && widget.Author == pkg.Author && widget.Version < pkg.Version { + if widget.URL == pkg.URL && widget.Name == pkg.Name && widget.Author == pkg.Author && 0 > semver.Compare("v"+widget.Version, "v"+pkg.Version) { widget.RepoHash = pkg.RepoHash return true } @@ -470,7 +470,7 @@ func isOutdatedTemplate(template *Template, bazaarTemplates []*Template) bool { } for _, pkg := range bazaarTemplates { - if template.URL == pkg.URL && template.Name == pkg.Name && template.Author == pkg.Author && template.Version < pkg.Version { + if template.URL == pkg.URL && template.Name == pkg.Name && template.Author == pkg.Author && 0 > semver.Compare("v"+template.Version, "v"+pkg.Version) { template.RepoHash = pkg.RepoHash return true }