mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-16 13:45:29 +01:00
🎨 Improve minimum version requirements for marketplace packages https://github.com/siyuan-note/siyuan/issues/16688
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
parent
d172fce34c
commit
5db1723bfc
6 changed files with 20 additions and 31 deletions
|
|
@ -85,10 +85,7 @@ func Icons() (icons []*Icon) {
|
|||
return
|
||||
}
|
||||
|
||||
if disallowDisplayBazaarPackage(icon.Package) {
|
||||
return
|
||||
}
|
||||
|
||||
icon.DisallowInstall = disallowInstallBazaarPackage(icon.Package)
|
||||
icon.URL = strings.TrimSuffix(icon.URL, "/")
|
||||
repoURLHash := strings.Split(repoURL, "@")
|
||||
icon.RepoURL = "https://github.com/" + repoURLHash[0]
|
||||
|
|
|
|||
|
|
@ -130,19 +130,20 @@ type Package struct {
|
|||
PreviewURLThumb string `json:"previewURLThumb"`
|
||||
IconURL string `json:"iconURL"`
|
||||
|
||||
Installed bool `json:"installed"`
|
||||
Outdated bool `json:"outdated"`
|
||||
Current bool `json:"current"`
|
||||
Updated string `json:"updated"`
|
||||
Stars int `json:"stars"`
|
||||
OpenIssues int `json:"openIssues"`
|
||||
Size int64 `json:"size"`
|
||||
HSize string `json:"hSize"`
|
||||
InstallSize int64 `json:"installSize"`
|
||||
HInstallSize string `json:"hInstallSize"`
|
||||
HInstallDate string `json:"hInstallDate"`
|
||||
HUpdated string `json:"hUpdated"`
|
||||
Downloads int `json:"downloads"`
|
||||
Installed bool `json:"installed"`
|
||||
Outdated bool `json:"outdated"`
|
||||
Current bool `json:"current"`
|
||||
Updated string `json:"updated"`
|
||||
Stars int `json:"stars"`
|
||||
OpenIssues int `json:"openIssues"`
|
||||
Size int64 `json:"size"`
|
||||
HSize string `json:"hSize"`
|
||||
InstallSize int64 `json:"installSize"`
|
||||
HInstallSize string `json:"hInstallSize"`
|
||||
HInstallDate string `json:"hInstallDate"`
|
||||
HUpdated string `json:"hUpdated"`
|
||||
Downloads int `json:"downloads"`
|
||||
DisallowInstall bool `json:"disallowInstall"`
|
||||
|
||||
Incompatible bool `json:"incompatible"`
|
||||
}
|
||||
|
|
@ -990,7 +991,7 @@ func getBazaarIndex() map[string]*bazaarPackage {
|
|||
// Add marketplace package config item `minAppVersion` https://github.com/siyuan-note/siyuan/issues/8330
|
||||
const defaultMinAppVersion = "2.9.0"
|
||||
|
||||
func disallowDisplayBazaarPackage(pkg *Package) bool {
|
||||
func disallowInstallBazaarPackage(pkg *Package) bool {
|
||||
if "" == pkg.MinAppVersion {
|
||||
pkg.MinAppVersion = defaultMinAppVersion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,10 +87,7 @@ func Plugins(frontend string) (plugins []*Plugin) {
|
|||
return
|
||||
}
|
||||
|
||||
if disallowDisplayBazaarPackage(plugin.Package) {
|
||||
return
|
||||
}
|
||||
|
||||
plugin.DisallowInstall = disallowInstallBazaarPackage(plugin.Package)
|
||||
plugin.Incompatible = isIncompatiblePlugin(plugin, frontend)
|
||||
|
||||
plugin.URL = strings.TrimSuffix(plugin.URL, "/")
|
||||
|
|
|
|||
|
|
@ -86,9 +86,7 @@ func Templates() (templates []*Template) {
|
|||
return
|
||||
}
|
||||
|
||||
if disallowDisplayBazaarPackage(template.Package) {
|
||||
return
|
||||
}
|
||||
template.DisallowInstall = disallowInstallBazaarPackage(template.Package)
|
||||
|
||||
template.URL = strings.TrimSuffix(template.URL, "/")
|
||||
repoURLHash := strings.Split(repoURL, "@")
|
||||
|
|
|
|||
|
|
@ -87,9 +87,7 @@ func Themes() (ret []*Theme) {
|
|||
return
|
||||
}
|
||||
|
||||
if disallowDisplayBazaarPackage(theme.Package) {
|
||||
return
|
||||
}
|
||||
theme.DisallowInstall = disallowInstallBazaarPackage(theme.Package)
|
||||
|
||||
theme.URL = strings.TrimSuffix(theme.URL, "/")
|
||||
repoURLHash := strings.Split(repoURL, "@")
|
||||
|
|
|
|||
|
|
@ -85,9 +85,7 @@ func Widgets() (widgets []*Widget) {
|
|||
return
|
||||
}
|
||||
|
||||
if disallowDisplayBazaarPackage(widget.Package) {
|
||||
return
|
||||
}
|
||||
widget.DisallowInstall = disallowInstallBazaarPackage(widget.Package)
|
||||
|
||||
widget.URL = strings.TrimSuffix(widget.URL, "/")
|
||||
repoURLHash := strings.Split(repoURL, "@")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue