From 055e011b3e4abca2d5d42ddc3accb978e1adff1e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 21 Mar 2024 17:09:08 +0800 Subject: [PATCH 1/2] :art: One-click upgrade of downloaded marketplace packages https://github.com/siyuan-note/siyuan/issues/8390 --- kernel/api/bazaar.go | 4 ++-- kernel/api/router.go | 2 +- kernel/model/bazzar.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/api/bazaar.go b/kernel/api/bazaar.go index e05ad04dd..d8fbcc73f 100644 --- a/kernel/api/bazaar.go +++ b/kernel/api/bazaar.go @@ -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, diff --git a/kernel/api/router.go b/kernel/api/router.go index fc6e51ee2..d4bc60b9b 100644 --- a/kernel/api/router.go +++ b/kernel/api/router.go @@ -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) diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go index f53e42e4f..573d4cf74 100644 --- a/kernel/model/bazzar.go +++ b/kernel/model/bazzar.go @@ -30,7 +30,7 @@ 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() { From d793155e55147477797f986a0f2fcf5eae33d8fb Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 21 Mar 2024 17:10:14 +0800 Subject: [PATCH 2/2] :art: One-click upgrade of downloaded marketplace packages https://github.com/siyuan-note/siyuan/issues/8390 --- kernel/model/bazzar.go | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go index 573d4cf74..6ec935baf 100644 --- a/kernel/model/bazzar.go +++ b/kernel/model/bazzar.go @@ -35,27 +35,52 @@ func UpdatedPackages(frontend string) (plugins []*bazaar.Plugin, widgets []*baza 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()