Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-22 08:16:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-03-21 17:32:50 +08:00
commit 3c1e298c8b
3 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/api/bazaar.go
View file

@ -25,7 +25,7 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func getBazaarPackages(c *gin.Context) {
func getUpdatedPackage(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
@ -35,7 +35,7 @@ func getBazaarPackages(c *gin.Context) {
}
frontend := arg["frontend"].(string)
plugins, widgets, icons, themes, templates := model.BazaarPackages(frontend)
plugins, widgets, icons, themes, templates := model.UpdatedPackages(frontend)
ret.Data = map[string]interface{}{
"plugins": plugins,
"widgets": widgets,

2
kernel/api/router.go
View file

@ -330,7 +330,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/graph/getGraph", model.CheckAuth, getGraph)
ginServer.Handle("POST", "/api/graph/getLocalGraph", model.CheckAuth, getLocalGraph)
ginServer.Handle("POST", "/api/bazaar/getBazaarPackages", model.CheckAuth, getBazaarPackages)
ginServer.Handle("POST", "/api/bazaar/getUpdatedPackage", model.CheckAuth, getUpdatedPackage)
ginServer.Handle("POST", "/api/bazaar/getBazaarPlugin", model.CheckAuth, getBazaarPlugin)
ginServer.Handle("POST", "/api/bazaar/getInstalledPlugin", model.CheckAuth, getInstalledPlugin)
ginServer.Handle("POST", "/api/bazaar/installBazaarPlugin", model.CheckAuth, model.CheckReadonly, installBazaarPlugin)

37
kernel/model/bazzar.go
View file

@ -30,32 +30,57 @@ import (
"github.com/siyuan-note/siyuan/kernel/bazaar"
)
func BazaarPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
func UpdatedPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*bazaar.Widget, icons []*bazaar.Icon, themes []*bazaar.Theme, templates []*bazaar.Template) {
wg := &sync.WaitGroup{}
wg.Add(5)
go func() {
defer wg.Done()
plugins = InstalledPlugins(frontend, "")
tmp := InstalledPlugins(frontend, "")
for _, plugin := range tmp {
if plugin.Outdated {
plugins = append(plugins, plugin)
}
}
}()
go func() {
defer wg.Done()
widgets = InstalledWidgets("")
tmp := InstalledWidgets("")
for _, widget := range tmp {
if widget.Outdated {
widgets = append(widgets, widget)
}
}
}()
go func() {
defer wg.Done()
icons = InstalledIcons("")
tmp := InstalledIcons("")
for _, icon := range tmp {
if icon.Outdated {
icons = append(icons, icon)
}
}
}()
go func() {
defer wg.Done()
themes = InstalledThemes("")
tmp := InstalledThemes("")
for _, theme := range tmp {
if theme.Outdated {
themes = append(themes, theme)
}
}
}()
go func() {
defer wg.Done()
templates = InstalledTemplates("")
tmp := InstalledTemplates("")
for _, template := range tmp {
if template.Outdated {
templates = append(templates, template)
}
}
}()
wg.Wait()