From 5aa57649743031c372b2156c15ba7a7394f04b4f Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 12 Oct 2022 09:13:40 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E4=BB=A3=E7=A0=81=20js/css=20=E7=89=87=E6=AE=B5=20htt?=
 =?UTF-8?q?ps://github.com/siyuan-note/siyuan/issues/6143?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/api/snippet.go |  3 ++-
 kernel/model/conf.go  | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/kernel/api/snippet.go b/kernel/api/snippet.go
index 315a1b39e..7b52eedd3 100644
--- a/kernel/api/snippet.go
+++ b/kernel/api/snippet.go
@@ -42,8 +42,9 @@ func getSnippet(c *gin.Context) {
 		enabled = false
 	}
 
+	confSnippets := model.LoadSnippets()
 	var snippets []*conf.Snippet
-	for _, s := range model.Snippets {
+	for _, s := range confSnippets {
 		if ("all" == typ || s.Type == typ) && (2 == enabledArg || s.Enabled == enabled) {
 			snippets = append(snippets, s)
 		}
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index af83ea920..b353689f1 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -285,7 +285,6 @@ func InitConf() {
 	}
 
 	util.SetNetworkProxy(Conf.System.NetworkProxy.String())
-	loadSnippets()
 }
 
 var langs = map[string]map[int]string{}
@@ -661,10 +660,8 @@ func clearWorkspaceTemp() {
 	logging.LogInfof("cleared workspace temp")
 }
 
-var Snippets []*conf.Snippet // js/css 代码片段配置
-
-func loadSnippets() {
-	Snippets = []*conf.Snippet{}
+func LoadSnippets() (ret []*conf.Snippet) {
+	ret = []*conf.Snippet{}
 
 	confPath := filepath.Join(util.DataDir, "snippets/conf.json")
 	if !gulu.File.IsExist(confPath) {
@@ -677,10 +674,10 @@ func loadSnippets() {
 		return
 	}
 
-	if err = gulu.JSON.UnmarshalJSON(data, &Snippets); nil != err {
+	if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
 		logging.LogErrorf("unmarshal js snippets failed: %s", err)
 		return
 	}
-	logging.LogInfof("loaded js snippets [%d]", len(Snippets))
+	logging.LogInfof("loaded js snippets [%d]", len(ret))
 	return
 }