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

🎨 Add marketplace package config item minAppVersion https://github.com/siyuan-note/siyuan/issues/8330

Browse source
This commit is contained in:
Daniel 2023-05-24 10:38:30 +08:00
parent 7379ff1e27
commit 8cbe54c2ab
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
6 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/bazaar/icon.go
View file

@ -29,7 +29,6 @@ import (
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/util"
"golang.org/x/mod/semver"
)
type Icon struct {
@ -64,10 +63,7 @@ func Icons() (icons []*Icon) {
return
}
if "" == icon.MinAppVersion {
icon.MinAppVersion = defaultMinAppVersion
}
if 0 < semver.Compare("v"+icon.MinAppVersion, "v"+util.Ver) {
if disallowDisplayBazaarPackage(icon.MinAppVersion) {
return
}

8
kernel/bazaar/package.go
View file

@ -19,6 +19,7 @@ package bazaar
import (
"bytes"
"errors"
"golang.org/x/mod/semver"
"os"
"path/filepath"
"strings"
@ -653,3 +654,10 @@ func getBazaarIndex() map[string]*bazaarPackage {
// defaultMinAppVersion 如果集市包中缺失 minAppVersion 项，则使用该值作为最低支持的版本号，小于该版本号时不显示集市包
// Add marketplace package config item `minAppVersion` https://github.com/siyuan-note/siyuan/issues/8330
const defaultMinAppVersion = "2.9.0"
func disallowDisplayBazaarPackage(minAppVersion string) bool {
if "" == minAppVersion {
return false
}
return 0 > semver.Compare("v"+minAppVersion, "v"+util.Ver)
}

6
kernel/bazaar/plugin.go
View file

@ -29,7 +29,6 @@ import (
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/util"
"golang.org/x/mod/semver"
)
type Plugin struct {
@ -66,10 +65,7 @@ func Plugins() (plugins []*Plugin) {
return
}
if "" == plugin.MinAppVersion {
plugin.MinAppVersion = defaultMinAppVersion
}
if 0 < semver.Compare("v"+plugin.MinAppVersion, "v"+util.Ver) {
if disallowDisplayBazaarPackage(plugin.MinAppVersion) {
return
}

6
kernel/bazaar/template.go
View file

@ -30,7 +30,6 @@ import (
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/util"
"golang.org/x/mod/semver"
)
type Template struct {
@ -65,10 +64,7 @@ func Templates() (templates []*Template) {
return
}
if "" == template.MinAppVersion {
template.MinAppVersion = defaultMinAppVersion
}
if 0 < semver.Compare("v"+template.MinAppVersion, "v"+util.Ver) {
if disallowDisplayBazaarPackage(template.MinAppVersion) {
return
}

6
kernel/bazaar/theme.go
View file

@ -29,7 +29,6 @@ import (
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/util"
"golang.org/x/mod/semver"
)
type Theme struct {
@ -66,10 +65,7 @@ func Themes() (ret []*Theme) {
return
}
if "" == theme.MinAppVersion {
theme.MinAppVersion = defaultMinAppVersion
}
if 0 < semver.Compare("v"+theme.MinAppVersion, "v"+util.Ver) {
if disallowDisplayBazaarPackage(theme.MinAppVersion) {
return
}

6
kernel/bazaar/widget.go
View file

@ -29,7 +29,6 @@ import (
"github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/util"
"golang.org/x/mod/semver"
)
type Widget struct {
@ -65,10 +64,7 @@ func Widgets() (widgets []*Widget) {
return
}
if "" == widget.MinAppVersion {
widget.MinAppVersion = defaultMinAppVersion
}
if 0 < semver.Compare("v"+widget.MinAppVersion, "v"+util.Ver) {
if disallowDisplayBazaarPackage(widget.MinAppVersion) {
return
}