From 99fdfd796608e763d9ac02cfc53f0718e73275e8 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Mon, 5 Sep 2022 12:46:57 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E9=9B=86=E5=B8=82?=
 =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E8=BD=BD=E5=8C=85=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=20https://github.com/siyuan-note/si?=
 =?UTF-8?q?yuan/issues/5807?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/api/bazaar.go   |  9 ++++-----
 kernel/model/bazzar.go | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/kernel/api/bazaar.go b/kernel/api/bazaar.go
index 1ee5011ae..1bfc36e25 100644
--- a/kernel/api/bazaar.go
+++ b/kernel/api/bazaar.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/88250/gulu"
 	"github.com/gin-gonic/gin"
-	"github.com/siyuan-note/siyuan/kernel/bazaar"
 	"github.com/siyuan-note/siyuan/kernel/model"
 	"github.com/siyuan-note/siyuan/kernel/util"
 )
@@ -56,7 +55,7 @@ func getInstalledWidget(c *gin.Context) {
 	defer c.JSON(http.StatusOK, ret)
 
 	ret.Data = map[string]interface{}{
-		"packages": bazaar.InstalledWidgets(),
+		"packages": model.InstalledWidgets(),
 	}
 }
 
@@ -121,7 +120,7 @@ func getInstalledIcon(c *gin.Context) {
 	defer c.JSON(http.StatusOK, ret)
 
 	ret.Data = map[string]interface{}{
-		"packages": bazaar.InstalledIcons(),
+		"packages": model.InstalledIcons(),
 	}
 }
 
@@ -188,7 +187,7 @@ func getInstalledTemplate(c *gin.Context) {
 	defer c.JSON(http.StatusOK, ret)
 
 	ret.Data = map[string]interface{}{
-		"packages": bazaar.InstalledTemplates(),
+		"packages": model.InstalledTemplates(),
 	}
 }
 
@@ -254,7 +253,7 @@ func getInstalledTheme(c *gin.Context) {
 	defer c.JSON(http.StatusOK, ret)
 
 	ret.Data = map[string]interface{}{
-		"packages": bazaar.InstalledThemes(),
+		"packages": model.InstalledThemes(),
 	}
 }
 
diff --git a/kernel/model/bazzar.go b/kernel/model/bazzar.go
index 0cd39280d..c379c4dc7 100644
--- a/kernel/model/bazzar.go
+++ b/kernel/model/bazzar.go
@@ -49,6 +49,11 @@ func BazaarWidgets() (widgets []*bazaar.Widget) {
 	return
 }
 
+func InstalledWidgets() (widgets []*bazaar.Widget) {
+	widgets = bazaar.InstalledWidgets()
+	return
+}
+
 func InstallBazaarWidget(repoURL, repoHash, widgetName string) error {
 	writingDataLock.Lock()
 	defer writingDataLock.Unlock()
@@ -91,6 +96,14 @@ func BazaarIcons() (icons []*bazaar.Icon) {
 	return
 }
 
+func InstalledIcons() (icons []*bazaar.Icon) {
+	icons = bazaar.InstalledIcons()
+	for _, icon := range icons {
+		icon.Current = icon.Name == Conf.Appearance.Icon
+	}
+	return
+}
+
 func InstallBazaarIcon(repoURL, repoHash, iconName string) error {
 	writingDataLock.Lock()
 	defer writingDataLock.Unlock()
@@ -138,6 +151,14 @@ func BazaarThemes() (ret []*bazaar.Theme) {
 	return
 }
 
+func InstalledThemes() (ret []*bazaar.Theme) {
+	ret = bazaar.InstalledThemes()
+	for _, theme := range ret {
+		theme.Current = theme.Name == Conf.Appearance.ThemeDark || theme.Name == Conf.Appearance.ThemeLight
+	}
+	return
+}
+
 func InstallBazaarTheme(repoURL, repoHash, themeName string, mode int, update bool) error {
 	writingDataLock.Lock()
 	defer writingDataLock.Unlock()
@@ -197,6 +218,11 @@ func BazaarTemplates() (templates []*bazaar.Template) {
 	return
 }
 
+func InstalledTemplates() (templates []*bazaar.Template) {
+	templates = bazaar.InstalledTemplates()
+	return
+}
+
 func InstallBazaarTemplate(repoURL, repoHash, templateName string) error {
 	writingDataLock.Lock()
 	defer writingDataLock.Unlock()